carnival 0.0.55 → 0.0.56

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

@@ -0,0 +1,5 @@
+- @options.each do |option|
+  - if option[0].to_s.empty? and option[1].to_s.empty?
+    %option= I18n.t("messages.select")
+  - else
+    %option{value: option[0]}= option[1]

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

@@ -1,6 +1,6 @@
 - index_path = caminho_modelo(:index)
 .gray_border.with_margin_bottom
-  %h1= t("#{@model_presenter.model_name}.editar.novo")
+  %h1= t("#{@model_presenter.model_name}.new", default: t('carnival.new'))
 .action_back
   - # TODO add buttons to the form in presenter
   = link_to t('back'), index_path, class: 'back_link' if @model_presenter

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

@@ -1,7 +1,7 @@
 - index_path = caminho_modelo(:index)
 - item = instance_variable_get("@#{@model_presenter.model_name}")
 .gray_border.with_margin_bottom
-  %h1= t("#{@model_presenter.model_name}.exibir")
+  %h1= t("#{@model_presenter.model_name}.show", default: t('carnival.show'))
 .action_back
   = link_to t('back'), index_path, class: 'back_link'
 
@@ -12,5 +12,8 @@
         .wrapper_show{class: "col-md-#{field.size}"}
           %label="#{t("activerecord.attributes.#{@model_presenter.full_model_name}.#{field.name}")}:"
           .value
-            = field_to_show @model_presenter,field.name,item
+            - if show_as_list @model_presenter,field.name
+              = render 'carnival/shared/show/show_as_list', items: item.send(field.name.to_s)
+            - else
+              = field_to_show @model_presenter,field.name,item
 

data/app/views/carnival/shared/_item_buttons.html.haml

@@ -1,3 +1,3 @@
 - presenter.actions_for_record.each do |key, action|
-  = render action.partial, :path => action.path(:id => record.id), :label => t("#{presenter.model_name}.#{action.name}")
+  = render action.partial, :path => action.path(:id => record.id), :label => t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}"))
 

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

@@ -4,5 +4,13 @@
 - options[:as] = :admin_relationship_select if current_type == :relation
 - options[:as] = :admin_date if current_type == :date
 - options[:as] = field.as if field.as.present?
-
+- options[:input_html] = {}
+- options[:input_html][:class] = "field-#{field.name}"
+- options[:input_html][:data] = {}
+- if field.depends_on.present?
+  - options[:input_html][:data][:depends_on] = field.depends_on
+  :javascript
+    $(".field-#{field.depends_on}").change(function(event, element){
+      updateDependentFormSelectHtml(element.selected, $(this).attr("name").match( /\[(.*)\]/)[1], $($(".field-#{field.name}").first()).attr("name").match( /\[(.*)\]/)[1]);
+    });
 = f.input field.name, options

data/app/views/carnival/shared/form/_field.html.haml.orig

@@ -0,0 +1,29 @@
+- options = {wrapper_html: {class: "col-md-#{field.size}"}}
+- current_type = field_type(model_presenter,field.name)
+<<<<<<< HEAD
+- if current_type == :has_one_relation
+  = ''
+- else
+  - options[:as] = :admin_enum if current_type == :enum
+  - if current_type == :relation
+    - options[:as] = :admin_relationship_select
+  - options[:as] = :admin_date if current_type == :date
+  - options[:as] = field.as if field.as.present?
+
+  = f.input field.name, options
+=======
+- options[:as] = :admin_enum if current_type == :enum
+- options[:as] = :admin_relationship_select if current_type == :relation
+- options[:as] = :admin_date if current_type == :date
+- options[:as] = field.as if field.as.present?
+- options[:input_html] = {}
+- options[:input_html][:class] = "field-#{field.name}"
+- options[:input_html][:data] = {}
+- if field.depends_on.present?
+  - options[:input_html][:data][:depends_on] = field.depends_on
+  :javascript
+    $(".field-#{field.depends_on}").change(function(event, element){
+      updateDependentFormSelectHtml(element.selected, $(this).attr("name").match( /\[(.*)\]/)[1], $($(".field-#{field.name}").first()).attr("name").match( /\[(.*)\]/)[1]);
+    });
+= f.input field.name, options
+>>>>>>> master

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

@@ -29,7 +29,6 @@
     newForm = newForm.replace(/([_a-zA-Z]+\[[_a-zA-Z]+_attributes\]\[)\d+(\]\[[_a-zA-Z]+\])/g, "$1" + last_index + "$2");
     $(selector).append(newForm);
     $(selector).find("select").chosen();
-    $(selector).find(".chosen-container").css({width:$(".chosen-container").parent().css("width")})
   }
 
   function getFormName(element){
@@ -39,8 +38,7 @@
   }
 
   function removeNestedFormElement(element){
-    $(element).parent().parent().hide();
-    $(element).parent().parent().find(".destroy").val(true);
+    $(element).parent().parent().remove();
   }
 
   function toggleNestedForm(element){
@@ -55,3 +53,66 @@
   function renderSelectOptions(selector){
     $(selector).show();
   }
+  function removeRelationOption(id, selectId){
+    $('#'+id+'_options').hide();
+    $('#'+id).attr('checked', false);
+    $('#'+id+'_select_option').prop('disabled', false);
+    $('#'+selectId).trigger("chosen:updated");
+  }
+
+  function addOption(selectId){
+    var option = $('#'+selectId).val();
+    if(option == -1)
+      return;
+    $('#'+option+'_options').show();
+    $('#'+option).prop('checked', true);
+    $('#'+option+'_select_option').prop('disabled', true);
+    $('#'+selectId).val(-1);
+    $('#'+selectId).trigger("chosen:updated");
+  }
+
+  function getNestedFormOptions(params){
+    $('#nested_form_options_'+params['field_name']).html();
+    var elemId = params['scope_html_id'];
+    var scopeValue = $('#'+elemId).val();
+
+    var key = params['scope_name'];
+    params['carnival_list_scope'] = {};
+    params['carnival_list_scope'][key] = scopeValue;
+
+    $.ajax({
+      url: params['url'],
+      data: params,
+      success: function(data){
+        $('#nested_form_options_'+params['field_name']).html(data.template);
+        var $select = $('#nested_form_options_'+params['field_name']).find('select');
+        updateNestedFormSelectHtml($select, params['has_new_action']);
+      }
+    });
+  }
+
+  function updateDependentFormSelectHtml(value, field, dependentField){
+    if(value != ""){
+      $.ajax("#{model_presenter.load_dependent_select_options_path}/#{model_presenter.presenter_name}/" + dependentField + "/" + field + "/" + value)
+        .done(function(data){
+          var selector = ".field-" + dependentField.replace("_id", "");
+          $(selector).html(data);
+          $(selector).trigger("chosen:updated");
+        })
+        .error(function(err, data){
+          console.log("updateDependentFormSelectHtml ajax error " + err);
+        });
+    }
+  }
+
+  function updateNestedFormSelectHtml($select, hasNewAction){
+    $select.css({width: $select.parent().css("width")})
+    if(!hasNewAction)
+      return;
+    $select.chosen(
+    {
+      create_option_text: 'Criar',
+      create_option: function(){createNewForm('.nested-form-list.'+params['field_name'], params['field_name'])}
+    });
+  }
+

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

@@ -8,41 +8,7 @@
     - line.each do |field|
       - nested_in = nil unless nested_in
       - if field.nested_form?
-        .nested-form{:class => field.name}
-
-          %h3.nested-form-title
-            = t("activerecord.attributes.#{@model_presenter.full_model_name}.#{field.name}")
-          .nested-form-actions
-            = link_to_function t("nested_form.close"), "toggleNestedForm(this);"
-
-            - if field.nested_form_modes?(:new)
-              = " | "
-              = link_to_function t("nested_form.new"), "createNewForm('.nested-form-list.#{field.name}', '#{field.name}')"
-
-            - if field.nested_form_modes?(:associate)
-              = " | "
-              = link_to_function t("nested_form.existing_option"), "renderSelectOptions('.existing-options.#{field.name}')"
-
-          - if field.nested_form_modes?(:associate)
-            .existing-options{:class => field.name}
-              %h4.existing-options-title
-                = t("nested_form.existing_option_title")
-              - field_presenter = model_presenter.presenter_to_field(field, nil)
-              = f.collection_check_boxes "#{field.name.singularize.to_sym}_ids".to_sym, field_presenter.model_class.list_for_checkbox, :first, :last
-
-          - if field.nested_form_modes?(:new)
-            %ul.nested-form-list{:class => field.name}
-              %h4.nested-form-subtitle
-                = t("nested_form.new_subtitle")
-              - model_object.send(field.name).build
-              = f.simple_fields_for field.name.to_sym do |inner_form|
-                %li.nested-form-list-item{:class => "#{inner_form.object.id.nil? and inner_form.object.errors.size == 0 ? 'form-new-association' : 'form-existent-association'}" }
-                  .nested-form-list-item-actions
-                    = link_to_function t("remove"), "removeNestedFormElement(this);" if field.nested_form_allow_destroy?
-                  = inner_form.input :id, :as => :hidden
-                  = inner_form.input :_destroy, :as => :hidden, :input_html => {:class => "destroy"} if field.nested_form_allow_destroy?
-                  - nested_presenter = model_presenter.presenter_to_field(field, inner_form.object)
-                  = render '/carnival/shared/form/inner_form', button: t('update'), model_object: inner_form.object, model_presenter: nested_presenter, :nested_in => model_object, :f => inner_form, :action => action
+        = render "/carnival/shared/form/nested_form", f: f, field: field, model_presenter: model_presenter, model_object: model_object, action: action
       - else
         - if model_presenter.must_render_field?(nested_in, field, model_object)
           = render "/carnival/shared/form/field", f: f, field: field, model_presenter: model_presenter

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

@@ -0,0 +1,20 @@
+.nested-form{:class => field.name}
+  %label.nested-form-title
+    = t("activerecord.attributes.#{@model_presenter.full_model_name}.#{field.name}")
+
+  - opt = Carnival::NestedFormOptions.new model_object, model_presenter, field
+  .nested_form_options_div{id: "nested_form_options_#{field.name}"}
+    = render '/carnival/shared/form/nested_form_options', opt_obj: opt
+
+  - if field.nested_form_modes?(:new)
+    %ul.nested-form-list{:class => field.name}
+      - model_presenter.build_relation_field(field, model_object)
+      = f.simple_fields_for field.name.to_sym do |inner_form|
+        - if inner_form.object.id.nil? and inner_form.object.errors.size == 0
+          %li.nested-form-list-item{:class => "#{inner_form.object.id.nil? and inner_form.object.errors.size == 0 ? 'form-new-association' : 'form-existent-association'}" }
+            .nested-form-list-item-actions
+              = link_to_function t("remove"), "removeNestedFormElement(this);" if field.nested_form_allow_destroy?
+            = inner_form.input :id, :as => :hidden
+            = inner_form.input :_destroy, :as => :hidden, :input_html => {:class => "destroy"} if field.nested_form_allow_destroy?
+            - nested_presenter = model_presenter.presenter_to_field(field, inner_form.object)
+            = render '/carnival/shared/form/inner_form', button: t('update'), model_object: inner_form.object, model_presenter: nested_presenter, :nested_in => model_object, :f => inner_form, :action => action

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

@@ -0,0 +1,29 @@
+.carnival-select-options
+  - if opt_obj.field.nested_form_modes?(:associate)
+    - scope_html_id = opt_obj.scope_html_id
+
+    .carnival-select-tag
+      = select_tag opt_obj.select_tag_id, options_for_select(opt_obj.select_options), {:onchange => 'addOption("'+opt_obj.select_tag_id+'")'}
+    .carnival-select-action
+      - if opt_obj.has_new_action?
+        = link_to_function t("nested_form.new"), "createNewForm('.nested-form-list.#{opt_obj.field_name}', '#{opt_obj.field_name}')"
+
+    - if scope_html_id.present?
+      :javascript
+        $('##{opt_obj.scope_html_id}').change(function(){#{opt_obj.scopeJSFunction}});
+        $(document).ready(function(){
+          updateNestedFormSelectHtml($('##{opt_obj.select_tag_id}'), #{opt_obj.has_new_action?});
+        });
+
+  - else
+    = link_to_function t("nested_form.new"), "createNewForm('.nested-form-list.#{opt_obj.field_name}', '#{opt_obj.field_name}')"
+
+.carnival-form-options
+  - checkbox_id = opt_obj.option_id OpenStruct.new(id: '')
+  = check_box_tag opt_obj.option_name, '',true, id: checkbox_id, style: "display: none;"
+  - opt_obj.available_options.each do |item|
+    - checkbox_id = opt_obj.option_id item
+    .carnival-form-options{id: "#{checkbox_id}_options", class: opt_obj.option_css_class(item) }
+      %span
+        = check_box_tag opt_obj.option_name, item.id, opt_obj.model_has_this_item?(item.id), id: checkbox_id, onclick: 'removeRelationOption("'+checkbox_id+'", "'+opt_obj.select_tag_id+'")'
+        = item.to_label

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

@@ -0,0 +1,4 @@
+%ul
+  - items.each do |item|
+    %li
+      = item.to_label

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

@@ -18,11 +18,12 @@
           - menus.delete :admin
           - menus.each do |key, menu|
             %li{:class =>menu[:class]}
-              = 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]}"}
+              = link_to t(menu[:label]), menu_link(menu[:link]), {:class => " btn_usuario sublevel"} unless menu[:link].nil?
+              - if menu[:subs].present?
+                %ul.dropdown_main_menu_sublevel
+                  - menu[:subs].each do |sub|
+                    %li
+                      = link_to t(sub[:label]), menu_link(sub[:link]), {:class => "#{set_resource_actived_if_current(sub[:link])} #{sub[:class]}"}
 
           %li.minify
             %span="Minimizar"

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

@@ -1,11 +1,20 @@
 pt-BR:
+
+  carnival:
+    show: Visualizar
+    new: Novo
+    edit: Editar
+    destroy: Apagar
+
   nested_form:
     open: Abrir
     close: Fechar
-    new: Criar
+    new: Criar Novo
+    add_option: Adicionar
     new_subtitle: Novos
     existing_option: Opções Existentes
     existing_option_title: Opções
+    choose_an_option: Escolha uma opção
 
   menu:
     dashboard: Dashboard
@@ -83,7 +92,6 @@ pt-BR:
     last_year: Ano passado
 
 
-
   # formatos de data e hora
   date:
     formats:
@@ -193,10 +201,6 @@ pt-BR:
 
   admin_user:
     name: Nome
-    show: Visualizar
-    destroy: Apagar
-    edit: Editando usuário administrador
-    new: Novo usuário administrador
     lista: Usuários administradores
     admin: Administrador
     account_name: Contaform

data/lib/carnival.rb

@@ -10,4 +10,8 @@ require "carnival/config"
 require "carnival/routes"
 require "carnival/version"
 module Carnival
+
+  def self.configure
+    yield(Carnival::Config)       
+  end
 end

data/lib/carnival/config.rb

@@ -1,12 +1,14 @@
 module Carnival
 
   class Config
-    mattr_accessor :menu, :devise_config, :omniauth, :omniauth_providers, :custom_css_files, :custom_javascript_files
+    mattr_accessor :menu, :devise_config, :omniauth, :omniauth_providers, :custom_css_files, :custom_javascript_files, :ar_admin_user_class, :root_action
     @@menu
     @@devise_config
     @@omniauth
     @@omniauth_providers
     @@custom_css_files = []
     @@custom_javascript_files = []
+    @@ar_admin_user_class = ActiveRecord::Base
+    @@root_action = "carnival/admin_users#index"
   end
 end

data/lib/carnival/routes.rb

@@ -2,6 +2,7 @@ module ActionDispatch::Routing
   class Mapper
     def mount_carnival_at(mount_location)
       scope mount_location do
+        get "carnival-base/load_dependent_select_options/:presenter/:field/:dependency_field/:dependency_value" => 'carnival/base_admin#load_dependent_select_options', as: :load_dependent_select_options
         get "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
@@ -10,7 +11,7 @@ module ActionDispatch::Routing
         else
           devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "sessions", :controllers => { :sessions => "carnival/sessions"}
         end
-        root to: "carnival/admin_users#index", :as => :admin_root
+        root to: Carnival::Config.root_action, :as => :admin_root
       end
     end
   end

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.0.55"
+  VERSION = "0.0.56"
 end

data/lib/carnival/version.rb.orig

@@ -0,0 +1,7 @@
+module Carnival
+<<<<<<< HEAD
+  VERSION = "0.1.0"
+=======
+  VERSION = "0.0.57"
+>>>>>>> master
+end

data/lib/generators/carnival/templates/carnival_initializer.rb

@@ -1,52 +1,63 @@
-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"
-                            }
-                          ]
-                        }
-                      }
-Carnival::Config.devise_config = :registerable, :recoverable, :rememberable, :trackable, :validatable,
-                                 :omniauthable
+Carnival.configure |config| do
+  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"
+        }
+      ]
+    }
+  }
+  config.devise_config = :registerable, :recoverable, :rememberable, :trackable, :validatable,
+                                   :omniauthable
 
-Carnival::Config.omniauth_providers = [:facebook, :google_oauth2]
+  config.omniauth_providers = [:facebook, :google_oauth2]
 
-Carnival::Config.omniauth = {facebook: ["324810390938005", "3c16625e74189a3708cc586dc050a6b2"],
-                            google_oauth2: ['431077382019-mumumjahr5cn6cooubtskc6ohael7923.apps.googleusercontent.com', 'ilH4B-KXN3tqG6qF9gGN1F_J']}
+  config.omniauth = {facebook: ["324810390938005", "3c16625e74189a3708cc586dc050a6b2"],
+                              google_oauth2: ['431077382019-mumumjahr5cn6cooubtskc6ohael7923.apps.googleusercontent.com', 'ilH4B-KXN3tqG6qF9gGN1F_J']}
 
-Carnival::Config.custom_css_files = ["samplefile.css"]
+  # Custom CSS Files
+  # config.custom_css_files = ["samplefile.css"]
 
-Carnival::Config.custom_javascript_files = ["samplefile.js"]
+  # Custom Javascript Files
+  # config.custom_javascript_files = ["samplefile.js"]
+
+  # Determine the super class of AdminUser
+  #config.ar_admin_user_class = ActiveRecord::Base
+
+  # Determine root action
+  #config.root_action = 'carnival/admin_users#index'
+end