carnival 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTVjNGZmZmYzOWNjNzIzMDcyZGFmNDk2ZTdkOGQ1MjUxNTY3NmE4OA==
+    NTRlNDdkMjYxZjJmYTBiZDljZDk3ZDk0OTI2YjE3ODM4ZWE1MjA1NA==
   data.tar.gz: !binary |-
-    NzcyYjU5MDA3MGZjNTI4N2VlZThhNjk3ZmE4Y2NlNzhhMmQ2MWNmMA==
+    MzQ4NTkxODlmMDJkNjg4MjRjNTE4OTc2M2UyZmM2M2JhYTczYmI4NQ==
 SHA512:
   metadata.gz: !binary |-
-    ODQ4NWYwY2I1ZGU3MzI3Nzk2OTBmMzdmMDQwNzA5NDAyYzQ4ZmRhOTBkOWNm
-    NWY2OGY2ZGVmZDhkZWQ5MTc4NTA1ZDMxZGM3ODIwNDA0MGY5NmEwYWUxZjU5
-    ZjdhMDBkN2FkNjJhYTMxM2NlNjk0NjRlM2MzNDE5ZjZlODJhMjc=
+    MTNjMTA0MDg5ZTA0ZjIyYjJiMzY4MTMyZGRjYTYzMTI5MjQxZjFjMmJjNjk0
+    MDBlODliNjM2YTZjZGRmMTE3MWE5MzQ1ODIyZDhlNDkyNjU0N2Q0ZWE4NDIw
+    NDBjYTY2MWEwMGIzMmEwOWY0NGMxM2JkNTQ4ZjIxYmRjMTkwZTk=
   data.tar.gz: !binary |-
-    NDVkZDE3NmE3ZjYxN2FjMzJhMTA0ZGM5Njc0NWYwMmVjMzc3MWVhOTBmYmE4
-    Zjk0ZTA0YTY5ZDBmMGFjYTMwYjM3NjhlZjNhMzdkZjYxZGY3NzNiMWY3NjBi
-    ZGVmYmM3ZTk3MDQ4NGI5YThiOTcxOWY3ZDdmMGVkYTgwNjYyNDY=
+    NTEyZWJlZWUxMTlmNjg3NzUzNTE5YzY4MDYzYzZjNTViOWFkMDFlNDc5NDk1
+    ZjM4MTdkMTViN2Y0MjQwNjUwODEwMWE2YWY2OTNjMzhhZjNiM2ZkNWMwMDRl
+    MWZjN2UwZTFiMDg4ZmJmMTJlYzBmOTA0N2Q5YmUxYzgwOTBhZjg=

data/app/assets/stylesheets/carnival/main.css

@@ -2221,3 +2221,76 @@ table input{
   padding-left: 15px;
   padding-right: 15px;
 }
+
+.login-container form{
+  background-color: #f7f7f7;
+  padding: 20px 25px 30px;
+  margin: 0 auto 25px;
+  width: 304px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+  box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+}
+
+.login-container form input[type=email], .login-container form input[type=password]{
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  appearance: none;
+  display: inline-block;
+  height: 36px;
+  padding: 0 8px;
+  margin: 0;
+  background: #fff;
+  border: 1px solid #d9d9d9;
+  border-top: 1px solid #c0c0c0;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -moz-border-radius: 1px;
+  -webkit-border-radius: 1px;
+  border-radius: 1px;
+  font-size: 15px;
+  color: #404040;
+  width: 100%;
+}
+
+.login-container h2{
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+.login-container .button{
+  width: 100%;
+  margin-top:20px;
+  margin-bottom:10px;
+}
+
+.button{
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  appearance: none;
+  display: inline-block;
+  height: 36px;
+  padding: 0 8px;
+  margin: 0;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -moz-border-radius: 1px;
+  -webkit-border-radius: 1px;
+  border-radius: 1px;
+  font-size: 15px;
+  box-shadow: 0 -1px 0px 0 #fff;
+  color: #333;
+  border: 1px solid #ccc;
+}
+
+.button:hover{
+  color: #fff;
+  cursor: pointer;
+  border: 1px solid #2A6198;
+  background-color: #2D66A0;
+}

data/app/controllers/carnival/base_admin_controller.rb

@@ -4,8 +4,8 @@ module Carnival
     before_filter :authenticate_admin_user!
 
     def generate_datatable
-      modelo_presenter = instantiate_presenter
-      Carnival::GenericDatatable.new(view_context, instantiate_model, self, modelo_presenter)
+      model_presenter = instantiate_presenter
+      Carnival::GenericDatatable.new(view_context, instantiate_model(model_presenter), self, model_presenter)
     end
 
     def index
@@ -75,13 +75,8 @@ module Carnival
 
     private
 
-    def instantiate_model
-      namespace = extract_namespace
-      if namespace.present?
-        "#{extract_namespace}::#{controller_name.classify}".constantize
-      else
-        "#{controller_name.classify}".constantize
-      end
+    def instantiate_model(presenter)
+      presenter.full_model_name.classify.constantize
     end
 
     def instantiate_presenter

data/app/controllers/carnival/sessions_controller.rb

@@ -1,12 +1,13 @@
 module Carnival
   class SessionsController < Devise::SessionsController
-     def create
+    layout "carnival/admin"
+    def create
       resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
       set_flash_message(:success, :signed_in) if is_navigational_format?
       redirect_to admin_root_url
-     end
+    end
 
-     def destroy
+    def destroy
       redirect_path = after_sign_out_path_for(resource_name)
       signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
       set_flash_message :success, :signed_out if signed_out && is_navigational_format?

data/app/datatable/carnival/generic_datatable.rb

@@ -59,7 +59,7 @@ module Carnival
       CSV.generate(:col_sep => "\t") do |csv|
         csv_line = []
         @presenter.fields_for_action(:csv).each do |key, field|
-          csv_line << I18n.t("#{@presenter.model_name}.#{field.name}")
+          csv_line << I18n.t("activerecord.attributes.#{@presenter.full_model_name}.#{field.name}")
         end
         csv << csv_line
 

data/app/presenters/carnival/admin_user_notification_presenter.rb

@@ -1,61 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Carnival
   class AdminUserNotificationPresenter < Carnival::BaseAdminPresenter
-    def listagem(tipo = nil)
-      [:notification__title, :message_link, :created_at]
-    end
-
-    def _listagem_botoes_extras
-      [
-        {
-          :link => 'admin_mark_notification_as_read',
-          :nome => "#{I18n.t('notification.mark_as_read')}",
-          :remote => true,
-          :success => 'markAsReadCallback',
-          :error => 'errorCallback',
-          :method => 'POST',
-          :campo => :mark_as_read_button
-        }
-      ]
-    end
-
-    def remoto?
-      true
-    end
-
-    def listagem_botoes
-      {:novo => false, :editar=> false, :apagar => false}
-    end
-
-    def busca_remoto?
-      true
-    end
-
-    def ordenacao_remoto
-      [:id]
-    end
-
-    def escopo
-      [:all, :unread]
-    end
-
-    def filtro_data
-      nil
-    end
-
-    def escopo_padrao
-      :unread
-    end
-
-    def busca_remoto
-      [:title, :message]
-    end
-
-    def advanced_search
-      {
-        :notification__title => [:field, :like],
-        :notification__message => [:field, :like]
-      }
-    end
   end
 end

data/app/presenters/carnival/admin_user_presenter.rb

@@ -24,30 +24,8 @@ module Carnival
     action :edit
     action :destroy
     action :new
-    action :teste1, :target => :record, :path=>"http://www.google.com.br"
-    action :teste2, :target => :page, :path=>"http://www.google.com.br"
 
-    def listagem_botoes
-      {:novo => true, :editar=> true, :apagar => true}
-    end
-
-    def listagem_botoes_extras
-      [
-        {
-          :link => 'admin_admin_user',
-          :nome => I18n.t('details')
-        }
-      ]
-    end
-
-    def filtro_data
-
-    end
-
-
-    def escopo
-      []
-    end
+    model_name "carnival/admin_user"
 
   end
 end

data/app/presenters/carnival/base_admin_presenter.rb

@@ -36,22 +36,11 @@ module Carnival
       @@actions[presenter_class_name].present? && @@actions[presenter_class_name][action].present?
     end
 
+    @@model_names = {}
     @@fields = {}
     @@scopes = {}
     @@forms = {}
 
-    def self.scope(name, params = {})
-      self.instantiate_element(@@scopes, Carnival::Scope, name, params)
-    end
-
-    def self.field(name, params = {})
-      self.instantiate_element(@@fields, Carnival::Field, name, params)
-    end
-
-    def self.form(action, params = {})
-      self.instantiate_element(@@forms, Carnival::Form, name, params)
-    end
-
     def scopes
       @@scopes[presenter_class_name]
     end
@@ -91,8 +80,17 @@ module Carnival
       form
     end
 
+
     def model_name
-      self.class.to_s.split("::").last().gsub("Presenter", "").underscore
+      if @@model_names[presenter_class_name].nil?
+        self.class.to_s.split("::").last().gsub("Presenter", "").underscore
+      else
+        if @@model_names[presenter_class_name].include?("/")
+          @@model_names[presenter_class_name].split("/").last
+        else
+          @@model_names[presenter_class_name]
+        end
+      end
     end
 
     def model_path(action, extra_params=nil)
@@ -103,7 +101,11 @@ module Carnival
     end
 
     def full_model_name
-      self.class.to_s.gsub("Presenter", "").underscore
+      if @@model_names[presenter_class_name].nil?
+        self.class.to_s.gsub("Presenter", "").underscore
+      else
+        @@model_names[presenter_class_name]
+      end
     end
 
     def controller_name
@@ -179,7 +181,7 @@ module Carnival
     end
 
     def model_class
-      self.class.to_s.gsub("Presenter", "").constantize
+      full_model_name.classify.constantize
     end
 
     def relation_field?(field)
@@ -195,7 +197,7 @@ module Carnival
         if model_class.reflect_on_association(field).macro == :belongs_to
           return record.send(field)
         else
-          return I18n.t("#{model_name}.#{field}")
+          return I18n.t("activerecord.attibutes.#{full_model_name}.#{field}")
         end
       end
       raise
@@ -251,14 +253,6 @@ module Carnival
       actions
     end
 
-    def self.presenter_class_name
-      if self.class.name == "Class"
-        self.to_s
-      else
-        self.class.name
-      end
-    end
-
     def presenter_class_name
       if self.class.name == "Class"
         self.to_s
@@ -320,11 +314,6 @@ module Carnival
       end
     end
 
-    def self.instantiate_element(container, klass, name, params)
-      container[presenter_class_name] = {} if container[presenter_class_name].nil?
-      container[presenter_class_name][name] = klass.new(name, params)
-    end
-
     def extract_namespace
       namespace = ""
       arr = self.class.to_s.split("::")
@@ -332,5 +321,33 @@ module Carnival
       namespace
     end
 
+    def self.instantiate_element(container, klass, name, params)
+      container[presenter_class_name] = {} if container[presenter_class_name].nil?
+      container[presenter_class_name][name] = klass.new(name, params)
+    end
+
+    def self.scope(name, params = {})
+      self.instantiate_element(@@scopes, Carnival::Scope, name, params)
+    end
+
+    def self.field(name, params = {})
+      self.instantiate_element(@@fields, Carnival::Field, name, params)
+    end
+
+    def self.form(action, params = {})
+      self.instantiate_element(@@forms, Carnival::Form, name, params)
+    end
+
+    def self.model_name(name)
+      @@model_names[presenter_class_name] = name
+    end
+
+    def self.presenter_class_name
+      if self.class.name == "Class"
+        self.to_s
+      else
+        self.class.name
+      end
+    end
   end
 end

data/app/views/admin_users/sessions/new.html.haml

@@ -0,0 +1,13 @@
+.login-container
+  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+    %h2 Efetuar login
+    %div
+      = f.email_field :email, :autofocus => true, :placeholder => "E-mail"
+    %div
+      = f.password_field :password, :placeholder => "Senha"
+    %div= f.submit "Fazer login", :class => "button"
+    - if devise_mapping.rememberable?
+      %div
+        = f.check_box :remember_me
+        = f.label "Continuar conectado"
+    = render "admin_users/shared/links"

data/app/views/admin_users/shared/_links.html.haml

@@ -0,0 +1,14 @@
+- if controller_name != 'sessions'
+  .sign_in
+    = link_to "Entrar", new_session_path(resource_name)
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  .sign_up
+    = link_to "Registrar-se", new_registration_path(resource_name)
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+  .forgot_password
+    = link_to "Resetar senha", new_password_path(resource_name)
+- if devise_mapping.omniauthable?
+  .oauth
+    - resource_class.omniauth_providers.each do |provider|
+      %div{class: provider}
+        = link_to "Login com #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)

data/app/views/carnival/shared/form/show.html.haml

@@ -1,5 +1,5 @@
 - index_path = caminho_modelo(:index)
-- item = instance_variable_get("@#{controller_name.classify.downcase}")
+- item = instance_variable_get("@#{@model_presenter.model_name}")
 .gray_border.with_margin_bottom
   %h1= t("#{@model_presenter.model_name}.exibir")
 .action_back
@@ -10,7 +10,7 @@
     .row
       - line.each do |field|
         .wrapper_show{class: "col-md-#{field.size}"}
-          %label="#{t("#{controller_name.classify.downcase}.#{field.name}")}:"
+          %label="#{t("activerecord.attributes.#{@model_presenter.full_model_name}.#{field.name}")}:"
           .value
             = field_to_show @model_presenter,field.name,item