carnival 0.2.7 → 0.2.8

data/app/assets/javascripts/carnival/{vizir_admin.js → vizir_admin.js.erb}

@@ -1,5 +1,10 @@
 // add/remove dynamic fields
-var Carnival = {}
+var Carnival = {
+  config: {
+    dateFormat: "<%= I18n.t('date.formats.default').gsub('%', '') %>"
+  }
+};
+
 String.prototype.unescapeHtml = function () {
     var temp = document.createElement("div");
     temp.innerHTML = this;
@@ -185,34 +190,55 @@ var pageLoad = function(){
   });
 
   var $lefty = $('div.menu.full');
-  $lefty.animate({
-    marginLeft: '-20%'
-  }, 100);
+  $lefty.hide();
 
   $('.minify').on("click", function(){
     var $lefty = $('div.menu.full');
-    $lefty.animate({
-      marginLeft: parseInt($lefty.css('margin-left'),10) == 0 ?
-       -$lefty.outerWidth()-2:
-        0
-    }, 100);
-    setTimeout("$('div.menu.short').fadeToggle(100)", 0)
-    setTimeout("$('#content').toggleClass('menu-opened')", 0)
-  })
+    var shouldHideExpandedMenu = (parseInt($lefty.css('margin-left'),10) == 0);
+
+    if(shouldHideExpandedMenu){
+      $lefty.animate({
+        marginLeft: (-$lefty.outerWidth() - 2)
+      }, 100);
+      setTimeout("$('div.menu.full').hide()", 100);
+    }
+    else{
+      $lefty.show();
+      $lefty.animate({
+        marginLeft: 0
+      }, 100);
+    }
+    setTimeout("$('div.menu.short').fadeToggle(100)", 0);
+    setTimeout("$('#content').toggleClass('menu-opened')", 0);
+  });
 };
 
 // form load functions
 
 function setupDateFields(){
+  var dateFormat = Carnival.config.dateFormat;
   var dateOptions = {
-    format: 'Y/m/d',
-    mask: true,
-    timepicker: false
+      format: dateFormat,
+      scrollInput: false,
+      mask: true,
+      timepicker: false
   };
-  var dateTimeOptions = $.extend({}, dateOptions, { timepicker: true, format: 'Y/m/d H:i'})
 
-  $(".datepicker").datetimepicker(dateOptions);
-  $(".datetimepicker").datetimepicker(dateTimeOptions);
+  var dateTimeOptions = $.extend({}, dateOptions, { timepicker: true, mask: true, format: dateFormat + ' H:i'} );
+
+  function addPicker(elem, options){
+    var value = $(elem).val();
+    $(elem).datetimepicker(options);
+    if(value)
+      $(elem).val(value);
+  }
+
+  $(".datepicker").each(function(){
+    addPicker(this, dateOptions);
+  });
+  $(".datetimepicker").each(function(){
+    addPicker(this, dateTimeOptions);
+  });
 }
 
 var formLoad = function(){

data/app/assets/stylesheets/carnival/actions.css.scss

@@ -112,12 +112,12 @@
   color:#fff;
 }
 
-.pdf, .csv{
+.csv{
   padding: 0px 10px 0px 25px;
   position: relative;
 }
 
-.pdf:before, .csv:before{
+.csv:before{
   content: '';
   display: block;
   width: 25px;
@@ -129,10 +129,6 @@
   top: 6px;
 }
 
-.pdf:before{
-  background-position: -279px -502px;
-}
-
 .csv:before{
   background-position: -101px -50px;
 }
@@ -153,7 +149,7 @@
   float: right;
   margin-left: 10px;
   font-size: 14px;
-  line-height: 25px;  
+  line-height: 25px;
   cursor: pointer;
 }
 

data/app/assets/stylesheets/carnival/carnival-table.css.scss

@@ -1,4 +1,4 @@
-/********************* TABLE BASE STYEL ********************* START */
+/********************* TABLE BASE STYLE ********************* START */
 
 .carnival-table{
   border-collapse: collapse;
@@ -86,7 +86,16 @@
 
 }
 
-/*********************** TABLE BASE STYEL ********************* END */
+/*********************** TABLE BASE STYLE ********************* END */
+
+/*********************** TABLE BATCHING ********************** START */
+
+.batching {
+  padding-left: 10px !important;
+  width: 36px;
+}
+
+/*********************** TABLE BATCHING ********************* END */
 
 /*********************** TABLE SORTABLES ********************** START */
 
@@ -101,4 +110,4 @@
 #sortable > li > a {float: right; padding-right: 10px;}
 #sortable > .ui-state-default {border: 0px; border-bottom: 1px solid lightGrey; background: transparent;}
 
-/*********************** TABLE SORTABLES ********************** END */
+/*********************** TABLE SORTABLES ********************** END */

data/app/assets/stylesheets/carnival/forms.css.scss

@@ -150,6 +150,7 @@ input::-webkit-inner-spin-button {
   width: 100%;
   float: left;
   padding: 0 0 10px;
+  min-height: 28px;
 }
 
 .gray_border h2{

data/app/assets/stylesheets/carnival/menu.css.scss

@@ -97,6 +97,9 @@ display: block;
   text-indent: -99999px !important;
 }
 
+ul.menu li.minify{
+  cursor: pointer;
+}
 
 ul.menu a.actived{
   color: #0088CC !important;
@@ -329,6 +332,3 @@ ul.menu .dropdown_main_menu_sublevel li a{
   background-repeat:no-repeat;
 }
 
-a.btn_usuario.sublevel.link{
-  display: none !important;
-}

data/app/assets/stylesheets/carnival/period.css.scss

@@ -36,7 +36,7 @@
 }
 
 #filtro_tempo #container_tempo #search_button_range{
-  background-image: url(image_path('search-button.png'));
+  background-image: image-url('carnival/search-button.png');
   width: 24px;
   height: 24px;
   display: block;

data/app/assets/stylesheets/carnival/search.css.scss

@@ -16,7 +16,6 @@
   height: 25px;
   background: url(image_path('carnival/sprites.png')) -375px 547px;
   left: 0px;
-  top: 0px;
   background-size: 400px;
 }
 
@@ -46,7 +45,7 @@
   display: none;
   border: 1px solid #ccc;
   padding: 20px;
-  margin-top: 26px;
+  margin-top: 87px;
   float: left;
   width: 270px;
   box-sizing: border-box;
@@ -83,15 +82,15 @@
 }
 
 .advanced-search-tags.explode1:hover{
-  height: 61px;  
+  height: 61px;
 }
 
 .advanced-search-tags.explode2:hover{
-  height: 122px;  
+  height: 122px;
 }
 
 .advanced-search-tags.explode3:hover{
-  height: 183px;  
+  height: 183px;
 }
 .advanced-search-tag{
   font-size: 13px;
@@ -107,6 +106,10 @@
   transition: all 0.3s ease;
 }
 
+.advanced-search-tag span{
+  float: left;
+}
+
 .advanced-search-tag a{
   color: #555;
   position: relative;
@@ -128,7 +131,7 @@
   height: 15px;
   width: 15px;
   line-height: 15px;
-  top: 1px;
+  top: 6px;
   color: #222;
   border-radius: 100px;
   text-align: center;

data/app/assets/stylesheets/carnival/structure.css.scss

@@ -2,22 +2,22 @@
 
 @font-face {
   font-family: 'OpenSansRegular';
-  src: url(image_path('fonts/opensans-regular-webfont.eot'));
-  src: url(image_path('fonts/opensans-regular-webfont.eot?#iefix')) format('embedded-opentype'),
-       url(image_path('fonts/opensans-regular-webfont.woff')) format('woff'),
-       url(image_path('fonts/opensans-regular-webfont.ttf')) format('truetype'),
-       url(image_path('fonts/opensans-regular-webfont.svg#OpenSansRegular')) format('svg');
+  src: url(font-path('carnival/opensans-regular-webfont.eot'));
+  src: url(font-path('carnival/opensans-regular-webfont.eot?#iefix')) format('embedded-opentype'),
+       url(font-path('carnival/opensans-regular-webfont.woff')) format('woff'),
+       url(font-path('carnival/opensans-regular-webfont.ttf')) format('truetype'),
+       url(font-path('carnival/opensans-regular-webfont.svg#OpenSansRegular')) format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'OpenSansSemibold';
-  src: url(image_path('fonts/opensans-semibold-webfont.eot'));
-  src: url(image_path('fonts/opensans-semibold-webfont.eot?#iefix')) format('embedded-opentype'),
-       url(image_path('fonts/opensans-semibold-webfont.woff')) format('woff'),
-       url(image_path('fonts/opensans-semibold-webfont.ttf')) format('truetype'),
-       url(image_path('fonts/opensans-semibold-webfont.svg#OpenSansSemibold')) format('svg');
+  src: url(font-path('carnival/opensans-semibold-webfont.eot'));
+  src: url(font-path('carnival/opensans-semibold-webfont.eot?#iefix')) format('embedded-opentype'),
+       url(font-path('carnival/opensans-semibold-webfont.woff')) format('woff'),
+       url(font-path('carnival/opensans-semibold-webfont.ttf')) format('truetype'),
+       url(font-path('carnival/opensans-semibold-webfont.svg#OpenSansSemibold')) format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/carnival/base_admin_controller.rb

@@ -1,88 +1,59 @@
 module Carnival
   class BaseAdminController < InheritedResources::Base
     respond_to :html, :json
-    layout "carnival/admin"
+    layout 'carnival/admin'
     before_action :instantiate_presenter
     helper_method :back_or_model_path
 
-    def home
-    end
-
-    def table_items
-      nil
-    end
-
-    def render_inner_form
-      @presenter = presenter_name(params[:field]).new controller: self
-      model_class = params[:field].classify.constantize
-      @model_object = model_class.find(params[:id])
-    end
-
-    def presenter_name field
-      field_name =  field.split('/').last
-      carnival_mount = Carnival::Config.mount_at
-      "#{carnival_mount}/#{field_name.singularize}_presenter".classify.constantize
-    end
-
     def index
-      @query_form = Carnival::QueryFormCreator.create(@presenter, params)
+      @query_form = QueryFormCreator.create(@presenter, params)
       @model = @presenter.model_class
-      @query_service = Carnival::QueryService.new(table_items || @model, @presenter, @query_form)
+      @query_service = QueryService.new(table_items, @presenter, @query_form)
+      @thead_renderer = TheadRenderer.new @presenter.fields_for_action(:index), @query_form.sort_column, @query_form.sort_direction
 
       respond_to do |format|
         format.html do
           @records = @query_service.get_query
-          last_page = (@query_service.total_records / @presenter.items_per_page.to_f).ceil
-          @paginator = Carnival::Paginator.new @query_form.page, last_page
-          @thead_renderer = Carnival::TheadRenderer.new @presenter.fields_for_action(:index), @query_form.sort_column, @query_form.sort_direction
+          @paginator = Paginator.new @query_form.page, @query_service.page_count
         end
         format.csv do
           @records = @query_service.records_without_pagination
-          render :csv => @model.model_name.human
-        end
-        format.pdf do
-          @records = @query_service.records_without_pagination
-          @thead_renderer = Carnival::TheadRenderer.new @presenter.fields_for_action(:index), @query_form.sort_column, @query_form.sort_direction
-          render :pdf => t("activerecord.attributes.#{@presenter.full_model_name}.pdf_name") , :template => 'carnival/base_admin/index.pdf.haml',  :show_as_html => params[:debug].present?
+          render csv: @model.model_name.human
         end
       end
     end
 
-    def show
-      show! do
-        instantiate_model
-      end
-    end
-
-    def new
-      new! do
-        instantiate_model
-      end
-    end
-
-    def edit
-      edit! do
-        instantiate_model
+    [:show, :new, :edit].each do |action|
+      define_method action do
+        send("#{action}!") do
+          instantiate_model
+        end
       end
     end
 
     def create
       create! do |success, failure|
-        success.html { redirect_to back_or_model_path, :notice => I18n.t("messages.created") }
-        failure.html { instantiate_model and render 'new' }
+        success.html { redirect_to back_or_model_path, notice: I18n.t('messages.created') }
+        failure.html { instantiate_model && render('new') }
       end
     end
 
     def update
       update! do |success, failure|
-        success.html { redirect_to back_or_model_path, :notice => I18n.t("messages.updated") }
-        failure.html { instantiate_model and render 'edit' }
+        success.html { redirect_to back_or_model_path, notice: I18n.t('messages.updated') }
+        failure.html { instantiate_model && render('edit') }
       end
     end
 
+    def render_inner_form
+      @presenter = presenter_name(params[:field]).new controller: self
+      model_class = params[:field].classify.constantize
+      @model_object = model_class.find(params[:id])
+    end
+
     def load_dependent_select_options
-      presenter = params[:presenter].constantize.send(:new, :controller => self)
-      model = presenter.relation_model(params[:field].gsub("_id", "").to_sym)
+      presenter = params[:presenter].constantize.send(:new, controller: self)
+      model = presenter.relation_model(params[:field].gsub('_id', '').to_sym)
       @options = model.list_for_select(add_empty_option: true, query: ["#{params[:dependency_field]} = ?", params[:dependency_value]])
       render layout: nil
     end
@@ -90,18 +61,28 @@ module Carnival
     def load_select_options
       model_name = params[:model_name]
       search_field = params[:search_field]
-      presenter = params[:presenter_name].constantize.send(:new, :controller => self)
+      presenter = params[:presenter_name].constantize.send(:new, controller: self)
       model = presenter.relation_model(model_name.to_sym)
       list = []
       model.where("#{search_field} like '%#{params[:q]}%'").each do |elem|
-        list << {id: elem.id, text: elem.send(search_field.to_sym)}
+        list << { id: elem.id, text: elem.send(search_field.to_sym) }
       end
 
-      render :json => list
+      render json: list
     end
 
     protected
 
+    def presenter_name(field)
+      field_name =  field.split('/').last
+      carnival_mount = Carnival::Config.mount_at
+      "#{carnival_mount}/#{field_name.singularize}_presenter".classify.constantize
+    end
+
+    def table_items
+      @presenter.model_class
+    end
+
     def instantiate_model
       @model = instance_variable_get("@#{resource_instance_name}")
     end
@@ -120,7 +101,7 @@ module Carnival
     end
 
     def extract_namespace
-      module_class_split = self.class.to_s.split("::")
+      module_class_split = self.class.to_s.split('::')
       if module_class_split.size > 1
         module_class_split[0]
       else
@@ -131,6 +112,5 @@ module Carnival
     def back_or_model_path
       params[:HTTP_REFERER] || @presenter.model_path(:index)
     end
-
   end
 end