carnival 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeef6dc229604a422ea21576f1e9f38229b0efa1
-  data.tar.gz: 998c57c81c831d6d27089381cb3e31cdbacc5a37
+  metadata.gz: c73e986f6ea765613317eca4b2db3a284c46b411
+  data.tar.gz: 509a5db0e41ac5ca5685b43930eac422c3837bb2
 SHA512:
-  metadata.gz: 072e97a3b2f59c3627f5de8a81019c9ef986d7fe175704acd8f85c1686fe5e0a0008f4fff304288ccf932db4296412dd00439a8a274d0aa0f943c37a0c1ca3af
-  data.tar.gz: 0770cd8a004bbc19314b6dce9957224f0bfa9e439a71532782a1bd363e24460b8859d63b2f0c3a373e4ed892a72d16ebb3850ccb78a086b6fdcf528ee5d6cc3d
+  metadata.gz: 4203a70cd1e1562d2a641435c2e158152bac8cac5868498fa9e92ff828dd4f865050814d452ecf9114b2acfbf4848a1b20da6777f6ec65a5e0ee1183504c4d1c
+  data.tar.gz: 3abe8e82e19d87cdef62f1c798a5ce2a0eac1e33c3bd27380204329a5dc9f31bd0b11cb8ebdf3ecbbbf1cd23925394aa29b536a19477e2db52ae296e803a19a1

data/app/views/carnival/base_admin/index.html.haml

@@ -50,7 +50,8 @@
         %select{"onchange" => "javascript:Carnival.sortIndexList(this)"}
           - @thead_renderer.columns.each do |column|
             - if column[:sort_function] != ''
-              %option{ :selected => column[:name] == @query_form.sort_column , :data => {column_name: "#{column[:name]}", sort_dir: "#{column[:sort_dir]}"} ,  "class" => "#{column[:class]}"}= translate_field(presenter, column[:field])
+              %option{ :selected => column[:name] == @query_form.sort_column && 'asc' == @query_form.sort_direction, :data => {column_name: "#{column[:name]}", sort_dir: "asc"} ,  "class" => "#{column[:class]}"}= "#{translate_field(presenter, column[:field])} - ▲".html_safe
+              %option{ :selected => column[:name] == @query_form.sort_column && 'desc' == @query_form.sort_direction, :data => {column_name: "#{column[:name]}", sort_dir: "desc"} ,  "class" => "#{column[:class]}"}= "#{translate_field(presenter, column[:field])} - ▼".html_safe
 
 - if @records.any?
 
@@ -69,7 +70,7 @@
       = link_to t('download_as_csv'), presenter.model_path(:index, {:format => 'csv'}.merge(params)), :class => "carnival-action-button pdf" if presenter.has_action?(:csv)
       = link_to t('download_as_pdf'), presenter.model_path(:index, {:format => 'pdf'}.merge(params)), :class => "carnival-action-button csv" if presenter.has_action?(:pdf)
 
-- else 
+- else
   .empty-result
     %h1
       = t('no_results')
@@ -77,4 +78,4 @@
       %span
         Adicionar novo registro
       - presenter.actions_for_page.each do |key, action|
-        = render '/carnival/shared/action_default', :label=>t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}")), :path=> action.path(presenter)
+        = render '/carnival/shared/action_default', :label=>t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}")), :path=> action.path(presenter)

data/config/locales/carnival.en.yml

@@ -22,4 +22,7 @@ en:
   paginate_previous: « Previous
   paginate_next: Next »
   paginate_last: Last
-  paginate_total: Total
+  paginate_total: Total
+  sort_by: Sort by
+  asc: Crescent
+  desc: Decrescent

data/config/locales/carnival.pt-br.yml

@@ -26,7 +26,9 @@ pt-BR:
     updated: Alterado com sucesso!
     select: Selecione
   minimize: Minimizar
-  sort_by: Ordenar por
+  sort_by: Ordenar po
+  asc: Crescente
+  desc: Decrescente
   download_as_csv: Baixar como CSV
   download_as_pdf: Baixar como PDF
   no_results: Não foram encontrados resultados
@@ -257,4 +259,3 @@ pt-BR:
         even: "precisa ser par"
     models:
       admin_user: Usuário Administrador
-

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Vizir Software Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -447,7 +447,6 @@ files:
 - app/datatable/carnival/generic_datatable/column_sorter_creator.rb
 - app/datatable/carnival/generic_datatable/relation_column_sorter.rb
 - app/helpers/carnival/base_admin_helper.rb
-- app/helpers/carnival/base_admin_helper.rb.orig
 - app/helpers/carnival/field_renderers/field_renderer.rb
 - app/helpers/carnival/field_renderers/many_relation_renderer.rb
 - app/helpers/carnival/field_renderers/renderer_creator.rb
@@ -589,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Carnival is an easy-to-use and extensible Rails Engine to speed the development

data/app/helpers/carnival/base_admin_helper.rb.orig

@@ -1,250 +0,0 @@
-module Carnival
-  module BaseAdminHelper
-    def set_resource_actived_if_current(path)
-      (request.fullpath == path)? 'actived' : ''
-    end
-
-    def show_messages
-      @messages = ''
-      flash.each do |type, message|
-        @messages = message
-        @type = type
-      end
-      javascript = "noty({'text':'#{@messages}',
-            'layout':'bottom','type':'#{@type}',
-            'animation': {'close':{'height':'toggle'}, 'open':{'height':'toggle'},'speed':500},'timeout':4000,
-            'closeWith':['click', 'hover']});"
-      return javascript if defined?(@type)
-      ''
-    end
-
-    def caminho_modelo(action, extra_params=nil)
-      params = {controller: controller.controller_name, action: action}
-      params = params.merge(extra_params) if extra_params.present?
-      url_for(params)
-    end
-
-    def carnival_render_if_exist partial_path
-      if partial_exist?(partial_path)
-        return render partial_path
-      end
-    end
-
-    def partial_exist? partial_path
-      File.exists?(get_partial_path(partial_path))
-    end
-
-    def has_many_relation? model, field
-      klass = Carnival::KlassService.new model.class
-      klass.is_a_has_many_relation?(field.to_sym)
-    end
-
-    def has_one_relation? model, field
-      klass = Carnival::KlassService.new model.class
-      klass.is_a_has_one_relation?(field.to_sym)
-    end
-
-    def many_to_many_relation? model, field
-      klass = Carnival::KlassService.new model.class
-      klass.is_a_many_to_many_relation?(field.to_sym)
-    end
-
-    def get_partial_path partial_path
-      path = Rails.root.join('app', 'views')
-      partial_path_array = partial_path.split('/')
-      partial_path_array.each do |pp|
-        if pp == partial_path_array.last
-          path = path.join "_#{pp}.html.haml"
-        else
-          path = path.join pp
-        end
-      end
-      path
-    end
-
-    def menu_link link
-      link.strip!
-      if link.to_s.end_with?('_path') or link.to_s.end_with?('_url')
-        return eval link
-      elsif link.index(/_path.+/) #path with arguments
-        return eval link
-      end
-
-      link
-    end
-
-    def show_view(presenter, field)
-      presenter.get_field(field).show_view
-    end
-
-    def show_as_list(presenter, field)
-      current_type = presenter.field_type(field)
-      if current_type != :relation
-        false
-      else
-        presenter.get_field(field).show_as_list
-      end
-    end
-
-<<<<<<< HEAD
-    def field_to_show(presenter, field_name, record, show_only_values=false)
-      if presenter.fields[field_name].params[:as] == :partial 
-        raw(render field_name.to_s, record: record)
-      else
-        rendered = field_value_and_type presenter, field_name, record
-        field_type = rendered[:field_type]
-        value = rendered[:value]
-
-        is_relation = presenter.relation_field?(field_name)
-=======
-    def field_to_show(presenter, field_name, record, show_only_value=false)
-      rendered = field_value_and_type presenter, field_name, record
-      field_type = rendered[:field_type]
-      value = rendered[:value]
-      
-      is_relation = presenter.relation_field?(field_name)
->>>>>>> 43cbab7664a6b7fd7b42b86626ec2bb9953b5711
-
-        unless value.nil?
-          formatted_field = format_field(presenter, field_name, field_type, value)
-          if is_relation and !show_only_values
-            link_to(formatted_field, presenter.relation_path(field_name, record))
-          else
-            formatted_field
-          end
-        else
-          nil
-        end
-      end
-    end
-
-    def field_value_and_type presenter, field_name, record
-      renderer = FieldRenderers::RendererCreator
-        .create_field_renderer(presenter, field_name)
-
-      rendered = renderer.render_field(record)
-    end
-
-    def is_image? field_type, value
-      field_type.nil? and value.class.to_s == "Paperclip::Attachment" and value.content_type.include? "image"
-    end
-
-    def format_field(presenter, field_name, field_type, value)
-      if is_image?(field_type, value)
-        "<img class='attr' src='#{value.url(:thumb)}' alt='#{translate_field(presenter, field_name)}' />"
-      else
-        case field_type
-        when :datetime
-          begin
-            I18n.l(value, format: :long_date)
-          rescue I18n::MissingTranslationData
-            value.strftime("%d/%m/%y %H:%M:%S")
-          end
-        when :date
-          begin
-            I18n.l(value, format: :short_date)
-          rescue I18n::MissingTranslationData
-            value.strftime("%d/%m/%Y")
-          end
-        when :number
-          number_with_precision(value, :precision => 2, :separator => ",")
-        when :enum
-          presenter.model_class.const_get(field_name.upcase)[value]
-        else
-          value
-        end
-      end
-    end
-
-    def translate_field(presenter, field_name)
-      field = presenter.get_field(field_name)
-      field_key = field.name_for_translation
-      presenter.full_model_name.classify.constantize.human_attribute_name field_key
-    end
-
-    def list_cel(presenter, field, record, only_render_fields)
-      result = field_to_show(presenter, field, record, only_render_fields)
-      return result if only_render_fields
-      td = "<td class='first-td'>"
-      return "#{td}<span class='#{get_css_class(presenter, field, record)}'>#{result}</span></td>" if presenter.get_field(field).css_class.present?
-      "#{td}#{result}</td>"
-    end
-
-    def grid_attr(presenter, field, record, only_render_fields)
-      result = field_to_show(presenter, field, record, only_render_fields)
-      return result if only_render_fields
-      list_attr(presenter, field, record, only_render_fields)
-    end
-
-    def list_attr(presenter, field, record, only_render_fields)
-      result = field_to_show(presenter, field, record, only_render_fields)
-      return result if only_render_fields
-      return "<div class='attr'><div class='label #{field}'>#{translate_field(presenter, field)}:</div><div class='field_value #{field} #{get_css_class(presenter, field, record)}'>#{result}</div></div>" if presenter.get_field(field).css_class.present?
-      "<div class='attr'><div class='label #{field}'>#{translate_field(presenter, field)}:</div><div class='field_value #{field}'>#{result}</div></div>"
-    end
-
-    def get_css_class presenter, field, record
-      css_class = presenter.get_field(field).css_class
-      return '' if !css_class
-      return record.send(css_class[:method]) if css_class.is_a? Hash
-      return css_class if css_class.is_a? String
-      return ''
-    end
-
-    def list_buttons(presenter, record)
-      result = ""
-      presenter.actions_for_record.each do |key, record_action|
-        if presenter.before_action(record_action, params[:action])
-          if record_action.show(record)
-            if record_action.remote?
-              result << button_action_remote(record_action, presenter, record)
-            else
-              result << button_action(record_action, presenter, record)
-            end
-          end
-        end
-      end
-      result
-    end
-
-    def button_action(action, presenter, record)
-      label = t("#{presenter.model_name.underscore}.#{action.name}", default: t("carnival.#{action.name}"))
-      path = action.path(presenter, :id => record.id)
-      if action.default_partial == :default
-        "<a class='carnival-action-link #{label.parameterize}' href='#{path}'>#{label}</a>"
-      elsif action.default_partial == :delete
-        confirm = I18n.t("are_you_sure")
-        "<a class='carnival-action-link apagar' data-confirm='#{confirm}' data-method='delete' href='#{path}' rel='nofollow'>#{label}</a>"
-      end
-    end
-
-    def button_action_remote(action, presenter, record)
-      name = action.name
-      params = action.params
-      label =  t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}"))
-      path = action.path(presenter, :id => record.id)
-
-      success_callback = "#{name}_success_callback"
-      if params[:success]
-        success_callback = params[:success]
-      end
-
-      error_callback = "#{name}_error_callback"
-      if params[:error]
-        error_callback = params[:error]
-      end
-
-      data_overlay = ''
-      if params[:show_overlay]
-        data_overlay = 'data-carnival-show-overlay=true'
-      end
-
-      params[:show_overlay] = false if params[:show_overlay].nil?
-
-      remote_function = "Carnival.remoteFunction(\"#{path}\", \"#{success_callback}\", \"#{error_callback}\", \"#{params[:method]}\", {} ,#{params[:show_overlay]})"
-
-      "<a class='carnival-action-link editar' href='javascript:#{remote_function}'>#{label}</a>"
-    end
-
-  end
-end