carnival 0.0.10 → 0.0.11

data/app/views/layouts/carnival/_menu.html.haml

@@ -1,30 +1,31 @@
 - menus = Carnival::Config::menu.clone
-.menu.full
-  %ul.menu
-    %li{:style => "border-top:none;"}
-      %span.arrow
-      %ul.dropdown_main_menu
-        %li.dashboard
-          = link_to t("menu.dashboard"), admin_root_url, {:class => " btn_usuario sublevel"}
-        %li.administracao
-          = link_to t("menu.admin"), "#", {:class => " btn_usuario sublevel"}
-          %ul.dropdown_main_menu_sublevel
-            %li
-              = link_to t('menu.admin_user'), admin_admin_users_path, {:class => "#{set_resource_actived_if_current(admin_admin_users_path)}"}
-            - menus[:admin][:subs].each do |sub|
-              %li
-                = link_to t(sub[:label]), sub[:link], {:class => "#{set_resource_actived_if_current(sub[:link])} #{sub[:class]}"}
-        - menus.delete :admin
-        - menus.each do |key, menu|
-          %li{:class =>key}
-            = link_to t(menu[:label]), menu[:link], {:class => " btn_usuario sublevel"}
+- if current_admin_user.present?
+  .menu.full
+    %ul.menu
+      %li{:style => "border-top:none;"}
+        %span.arrow
+        %ul.dropdown_main_menu
+          %li.dashboard
+            = link_to t("menu.dashboard"), admin_root_url, {:class => " btn_usuario sublevel"}
+          %li.administracao
+            = link_to t("menu.admin"), "#", {:class => " btn_usuario sublevel"}
             %ul.dropdown_main_menu_sublevel
-              - menu[:subs].each do |sub|
+              %li
+                = link_to t('menu.admin_user'), carnival_admin_users_path, {:class => "#{set_resource_actived_if_current(carnival_admin_users_path)}"}
+              - menus[:admin][:subs].each do |sub|
                 %li
                   = link_to t(sub[:label]), sub[:link], {:class => "#{set_resource_actived_if_current(sub[:link])} #{sub[:class]}"}
+          - menus.delete :admin
+          - menus.each do |key, menu|
+            %li{:class =>key}
+              = link_to t(menu[:label]), menu[:link], {:class => " btn_usuario sublevel"}
+              %ul.dropdown_main_menu_sublevel
+                - menu[:subs].each do |sub|
+                  %li
+                    = link_to t(sub[:label]), sub[:link], {:class => "#{set_resource_actived_if_current(sub[:link])} #{sub[:class]}"}
 
-        %li.minify
-          %span="Minimizar"
+          %li.minify
+            %span="Minimizar"
 
 
-.menu.short
+  .menu.short

data/app/views/layouts/carnival/_notifications_list.html.haml

@@ -17,9 +17,9 @@
             %li{:class => "#{(n.read)? 'read' : 'unread'}"}
               %span.title="#{n.notification.title}:"
               %br
-              %span.message= link_to n.notification.message.html_safe, admin_read_admin_user_notification_path(n)
+              %span.message= link_to n.notification.message.html_safe, carnival_read_admin_user_notification_path(n)
     .view-all
-      %span.message= link_to "Ver todas notificações", admin_admin_user_notifications_path
+      %span.message= link_to "Ver todas notificações", carnival_admin_user_notifications_path
 
 :javascript
   $(document).ready(function(){

data/app/views/layouts/carnival/admin.html.haml

@@ -26,7 +26,7 @@
           %div.safe-guard-notification
             = render '/layouts/carnival/notifications_list'
           %div.salute
-            = link_to edit_admin_admin_user_path(:id => current_admin_user.id) do
+            = link_to edit_carnival_admin_user_path(:id => current_admin_user.id) do
               .email
                 = current_admin_user.email
               %figure

data/config/initializers/carnival_initializer.rb

@@ -39,3 +39,4 @@ Carnival::Config.menu = {
                           ]
                         }
                       }
+

data/config/initializers/devise.rb

@@ -200,7 +200,7 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = false
+  config.scoped_views = true
 
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes (usually :user).

data/config/locales/carnival.pt.yml

@@ -184,12 +184,13 @@ pt:
     id: ID
 
   admin_user:
+    name: Nome
     edit: Editando usuário administrador
     new: Novo usuário administrador
     lista: Usuários administradores
     email: E-mail
     admin: Administrador
-    account_name: Conta
+    account_name: Contaform
     notification: Notificação
     current_sign_in_at: Acesso atual em
     last_sign_in_at: Último acesso em

data/config/routes.rb

@@ -1,7 +1,6 @@
 Carnival::Engine.routes.draw do
-  mount_my_engine_at 'admin'
-  # resources :admin_user_notifications, controller: "carnival/admin_user_notifications", :as => :admin_admin_user_notifications
-  # resources :admin_users, controller: "carnival/admin_users", :as => :admin_admin_users
+  # resources :admin_user_notifications, controller: "carnival/admin_user_notifications", :as => :carnival_admin_user_notifications
+  # resources :admin_users, controller: "carnival/admin_users", :as => :carnival_admin_users
   # devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "carnival/sessions", :controllers => { :sessions => "carnival/sessions", :omniauth_callbacks => "carnival/omniauth_callbacks" }
   # get 'carnival/admin_user_notification/read/:id' => 'carnival/admin_user_notifications#read', as: :admin_read_admin_user_notification
   # root to: "carnival/admin_users#index", :as => :admin_root

data/lib/carnival/routes.rb

@@ -1,12 +1,12 @@
 module ActionDispatch::Routing
   class Mapper
-    def mount_my_engine_at(mount_location)
+    def mount_carnival_at(mount_location)
       scope mount_location do
-        get 'carnival/admin_user_notification/read/:id' => 'carnival/admin_user_notifications#read', as: :admin_read_admin_user_notification
-        resources :admin_user_notifications, controller: "carnival/admin_user_notifications", :as => :admin_admin_user_notifications
-        resources :admin_users, controller: "carnival/admin_users", :as => :admin_admin_users
-        devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "carnival/sessions", :controllers => { :sessions => "carnival/sessions", :omniauth_callbacks => "carnival/omniauth_callbacks" }
-        root to: "carnival/admin_users#index", :as => :admin_root
+        get "#{mount_location}/admin_user_notification/read/:id" => 'carnival/admin_user_notifications#read', as: :carnival_read_admin_user_notification
+        resources :admin_user_notifications, controller: "carnival/admin_user_notifications", :as => :carnival_admin_user_notifications
+        resources :admin_users, controller: "carnival/admin_users", :as => :carnival_admin_users
+        devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "#{mount_location}/sessions", :controllers => { :sessions => "carnival/sessions", :omniauth_callbacks => "#{mount_location}/omniauth_callbacks" }
+        root to: "#{mount_location}/admin_users#index", :as => :admin_root
       end
     end
   end

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/generators/carnival/install_generator.rb

@@ -5,7 +5,7 @@ module Carnival
       source_root File.expand_path("../templates", __FILE__)
 
       def install
-        route "mount_my_engine_at 'admin'"
+        route "mount_carnival_at 'admin'"
         rake 'carnival_engine:install:migrations'
         template "../../../../config/locales/carnival.en.yml", "config/locales/carnival.en.yml"
         template "../../../../config/locales/carnival.pt.yml", "config/locales/carnival.pt.yml"

data/test/dummy/config/initializers/carnival_initializer.rb

@@ -0,0 +1,41 @@
+Carnival::Config.menu = {
+                        :admin => {
+                              :label => "aaa",
+                              :class => "ssss",
+                              :link => "ddd",
+                              :subs => [
+                                {
+                                  :label => "menu.testes",
+                                  :class => "tst",
+                                  :link => "/admin/testes"
+                                },
+                                {
+                                  :label => "55555",
+                                  :class => "66666",
+                                  :link => "777777"
+                                }
+                              ]
+                        },
+                        :locations => {
+                          :label => "menu.locations",
+                          :class => "",
+                          :link => "#",
+                          :subs => [
+                            {
+                              :label => "menu.countries",
+                              :class => "countries",
+                              :link => "/admin/countries"
+                            },
+                            {
+                              :label => "menu.states",
+                              :class => "states",
+                              :link => "/admin/states"
+                            },
+                            {
+                              :label => "menu.cities",
+                              :class => "cities",
+                              :link => "/admin/cities"
+                            }
+                          ]
+                        }
+                      }

data/test/dummy/config/locales/carnival.en.yml

@@ -0,0 +1 @@
+en:

data/test/dummy/config/locales/carnival.pt.yml

@@ -0,0 +1,232 @@
+pt:
+  menu:
+    dashboard: Dashboard
+    admin_user: Usuários administradores
+  messages:
+    created: Criado com sucesso!
+    updated: Alterado com sucesso!
+    select: Selecione
+  download_as_csv: Baixar como CSV
+  download_as_pdf: Baixar como PDF
+  advanced_search: Busca avançada
+  select_an_option: Selecione uma opção
+  without_country: Sem país
+  without_state: Sem estado
+  without_city: Sem cidade
+  search: Busca
+  clear: Limpar
+  login: Entrar
+  logout: Sair
+  edit: Editar
+  send: Enviar
+  create: Criar
+  delete: Apagar
+  remove: Remover
+  destroy: Apagar
+  details: Detalhes
+  view: Ver
+  please_wait: Aguarde...
+  are_you_sure: Você tem certeza que deseja apagar?
+  are_you_sure_block: Você tem certeza que deseja bloquear?
+  are_you_sure_unblock: Você tem certeza que deseja desbloquear?
+  select: Selecione
+  search: Buscar
+  previous: Anterior
+  next: Próxima
+  update: Atualizar
+  new: Adicionar
+  back: Voltar
+  save: Salvar
+  yyes: Sim
+  nno: Não
+  from: De
+  to: Até
+  master_user: SafeGuard Admin
+  blocked: Bloqueado
+  unblocked: Desbloqueado
+  was: foi
+  of: de
+  by: por
+  at: às
+  new_support: Abrir solicitação de suporte
+  batch_operations: Operações em Lote
+  data_tables:
+    first: Primeira
+    last: Última
+    next: Próxima
+    previous: Anterior
+    row_counter: Mostrando _START_ a _END_ de _TOTAL_ entradas
+    row_counter_empty: Mostrando de 0 até 0 de 0 registros
+    table_empty: Não há registros para exibir
+    rows_filtered: (filtrando de _MAX_)
+    rows_postfix:
+    rows_per_page: Exibir _MENU_ registros
+    processing: Processando
+    search:
+    zero_records: Não há registros para exibir
+  date_filter:
+    today: Hoje
+    yesterday: Ontem
+    this_week: Esta semana
+    last_week: Semana passada
+    this_month: Este mês
+    last_month: Mês passado
+    this_year: Este ano
+    last_year: Ano passado
+
+
+
+  # formatos de data e hora
+  date:
+    formats:
+      default: "%d/%m/%Y"
+      short: "%d de %B"
+      long: "%d de %B de %Y"
+      only_day: "%d"
+
+    day_names: [Domingo, Segunda, Terça, Quarta, Quinta, Sexta, Sábado]
+    abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb]
+    month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
+    abbr_month_names: [~, Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez]
+    order:
+      - :day
+      - :month
+      - :year
+
+  time:
+    formats:
+      default: "%A, %d de %B de %Y, %H:%M hs"
+      time: "%H:%M hs"
+      short: "%d/%m, %H:%M hs"
+      long: "%A, %d de %B de %Y, %H:%M hs"
+      only_second: "%S"
+      datetime:
+        formats:
+          default: "%Y-%m-%dT%H:%M:%S%Z"
+    am: ''
+    pm: ''
+
+  # date helper distanci em palavras
+  datetime:
+    distance_in_words:
+      half_a_minute: 'meio minuto'
+      less_than_x_seconds:
+        one: 'menos de 1 segundo'
+        other: 'menos de {{count}} segundos'
+
+      x_seconds:
+        one: '1 segundo'
+        other: '{{count}} segundos'
+
+      less_than_x_minutes:
+        one: 'menos de um minuto'
+        other: 'menos de {{count}} minutos'
+
+      x_minutes:
+        one: '1 minuto'
+        other: '{{count}} minutos'
+
+      about_x_hours:
+        one: 'aproximadamente 1 hora'
+        other: 'aproximadamente {{count}} horas'
+
+      x_days:
+        one: '1 dia'
+        other: '{{count}} dias'
+
+      about_x_months:
+        one: 'aproximadamente 1 mês'
+        other: 'aproximadamente {{count}} meses'
+
+      x_months:
+        one: '1 mês'
+        other: '{{count}} meses'
+
+      about_x_years:
+        one: 'aproximadamente 1 ano'
+        other: 'aproximadamente {{count}} anos'
+
+      over_x_years:
+        one: 'mais de 1 ano'
+        other: 'mais de {{count}} anos'
+
+  # numeros
+  number:
+    format:
+      precision: 3
+      separator: ','
+      delimiter: '.'
+    currency:
+      format:
+        unit: 'R$'
+        precision: 2
+        format: '%u %n'
+        separator: ','
+        delimiter: '.'
+    percentage:
+      format:
+        delimiter: '.'
+    precision:
+      format:
+        delimiter: '.'
+    human:
+      format:
+        precision: 1
+        delimiter: '.'
+  support:
+    array:
+      sentence_connector: "e"
+      skip_last_comma: true
+
+  default_columns: &default_columns
+    created_at: Criado em
+    updated_at: Atualizado em
+    id: ID
+
+  admin_user:
+    edit: Editando usuário administrador
+    new: Novo usuário administrador
+    lista: Usuários administradores
+
+  # Active Record
+  activerecord:
+    errors:
+      template:
+        header:
+          one: "Não pôde ser salvo: 1 erro"
+          other: "Não pôde ser salvo: {{count}} erros."
+        body: "Por favor, cheque os seguintes campos:"
+      messages:
+        inclusion: "não está incluso na lista"
+        exclusion: "não está disponível"
+        invalid: "não é válido"
+        confirmation: "não bate com a confirmação"
+        accepted: "precisa ser aceito"
+        empty: "não pode ser vazio"
+        blank: "não pode ser vazio"
+        too_long: "é muito longo (não mais do que {{count}} caracteres)"
+        too_short: "é muito curto (não menos do que {{count}} caracteres)"
+        wrong_length: "não é do tamanho correto (precisa ter {{count}} caracteres)"
+        taken: "não está disponível"
+        not_a_number: "não é um número"
+        greater_than: "precisa ser maior do que {{count}}"
+        greater_than_or_equal_to: "precisa ser maior ou igual a {{count}}"
+        equal_to: "precisa ser igual a {{count}}"
+        less_than: "precisa ser menor do que {{count}}"
+        less_than_or_equal_to: "precisa ser menor ou igual a {{count}}"
+        odd: "precisa ser ímpar"
+        even: "precisa ser par"
+    models:
+      admin_user: Usuário Administrador
+    attributes:
+      carnival/admin_user:
+        name: Nome
+        email: E-mail
+        admin: Administrador
+        account_name: Conta
+        notification: Notificação
+        current_sign_in_at: Acesso atual em
+        last_sign_in_at: Último acesso em
+        sign_in_count: Total de acessos
+        <<: *default_columns
+

data/test/dummy/config/locales/devise.en.yml

@@ -0,0 +1,59 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your account was successfully confirmed."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account will be locked."
+      not_found_in_database: "Invalid email or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock Instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
+    registrations:
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"