carnival 0.0.11 → 0.0.26

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

@@ -10,4 +10,5 @@
  *= require carnival/main.css
  *= require carnival/jquery-ui-1.8.11.custom
  *= require carnival/perfect-scrollbar-0.4.6.min
+ *= require carnival/jquery.fancybox
 */

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

@@ -1,8 +1,8 @@
 thead tr.filters{display: none;}
 .dataTables_wrapper{
   float:left;
-  width:99%;
-  overflow-x:auto;
+  /* width:99%; */
+  overflow: hidden;
   position: relative;
   top:-37px;
 }

data/app/assets/stylesheets/carnival/jquery.fancybox.css

@@ -0,0 +1,274 @@
+/*! fancyBox v2.1.5 fancyapps.com | fancyapps.com/fancybox/#license */
+.fancybox-wrap,
+.fancybox-skin,
+.fancybox-outer,
+.fancybox-inner,
+.fancybox-image,
+.fancybox-wrap iframe,
+.fancybox-wrap object,
+.fancybox-nav,
+.fancybox-nav span,
+.fancybox-tmp
+{
+	padding: 0;
+	margin: 0;
+	border: 0;
+	outline: none;
+	vertical-align: top;
+}
+
+.fancybox-wrap {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 8020;
+}
+
+.fancybox-skin {
+	position: relative;
+	background: #f9f9f9;
+	color: #444;
+	text-shadow: none;
+	-webkit-border-radius: 4px;
+	   -moz-border-radius: 4px;
+	        border-radius: 4px;
+}
+
+.fancybox-opened {
+	z-index: 8030;
+}
+
+.fancybox-opened .fancybox-skin {
+	-webkit-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+	   -moz-box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 10px 25px rgba(0, 0, 0, 0.5);
+}
+
+.fancybox-outer, .fancybox-inner {
+	position: relative;
+}
+
+.fancybox-inner {
+	overflow: hidden;
+}
+
+.fancybox-type-iframe .fancybox-inner {
+	-webkit-overflow-scrolling: touch;
+}
+
+.fancybox-error {
+	color: #444;
+	font: 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
+	margin: 0;
+	padding: 15px;
+	white-space: nowrap;
+}
+
+.fancybox-image, .fancybox-iframe {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+.fancybox-image {
+	max-width: 100%;
+	max-height: 100%;
+}
+
+#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
+	background-image: url('fancybox_sprite.png');
+}
+
+#fancybox-loading {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	margin-top: -22px;
+	margin-left: -22px;
+	background-position: 0 -108px;
+	opacity: 0.8;
+	cursor: pointer;
+	z-index: 8060;
+}
+
+#fancybox-loading div {
+	width: 44px;
+	height: 44px;
+	background: url('fancybox_loading.gif') center center no-repeat;
+}
+
+.fancybox-close {
+	position: absolute;
+	top: -18px;
+	right: -18px;
+	width: 36px;
+	height: 36px;
+	cursor: pointer;
+	z-index: 8040;
+}
+
+.fancybox-nav {
+	position: absolute;
+	top: 0;
+	width: 40%;
+	height: 100%;
+	cursor: pointer;
+	text-decoration: none;
+	background: transparent url('blank.gif'); /* helps IE */
+	-webkit-tap-highlight-color: rgba(0,0,0,0);
+	z-index: 8040;
+}
+
+.fancybox-prev {
+	left: 0;
+}
+
+.fancybox-next {
+	right: 0;
+}
+
+.fancybox-nav span {
+	position: absolute;
+	top: 50%;
+	width: 36px;
+	height: 34px;
+	margin-top: -18px;
+	cursor: pointer;
+	z-index: 8040;
+	visibility: hidden;
+}
+
+.fancybox-prev span {
+	left: 10px;
+	background-position: 0 -36px;
+}
+
+.fancybox-next span {
+	right: 10px;
+	background-position: 0 -72px;
+}
+
+.fancybox-nav:hover span {
+	visibility: visible;
+}
+
+.fancybox-tmp {
+	position: absolute;
+	top: -99999px;
+	left: -99999px;
+	visibility: hidden;
+	max-width: 99999px;
+	max-height: 99999px;
+	overflow: visible !important;
+}
+
+/* Overlay helper */
+
+.fancybox-lock {
+    overflow: hidden !important;
+    width: auto;
+}
+
+.fancybox-lock body {
+    overflow: hidden !important;
+}
+
+.fancybox-lock-test {
+    overflow-y: hidden !important;
+}
+
+.fancybox-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	overflow: hidden;
+	display: none;
+	z-index: 8010;
+	background: url('fancybox_overlay.png');
+}
+
+.fancybox-overlay-fixed {
+	position: fixed;
+	bottom: 0;
+	right: 0;
+}
+
+.fancybox-lock .fancybox-overlay {
+	overflow: auto;
+	overflow-y: scroll;
+}
+
+/* Title helper */
+
+.fancybox-title {
+	visibility: hidden;
+	font: normal 13px/20px "Helvetica Neue",Helvetica,Arial,sans-serif;
+	position: relative;
+	text-shadow: none;
+	z-index: 8050;
+}
+
+.fancybox-opened .fancybox-title {
+	visibility: visible;
+}
+
+.fancybox-title-float-wrap {
+	position: absolute;
+	bottom: 0;
+	right: 50%;
+	margin-bottom: -35px;
+	z-index: 8050;
+	text-align: center;
+}
+
+.fancybox-title-float-wrap .child {
+	display: inline-block;
+	margin-right: -100%;
+	padding: 2px 20px;
+	background: transparent; /* Fallback for web browsers that doesn't support RGBa */
+	background: rgba(0, 0, 0, 0.8);
+	-webkit-border-radius: 15px;
+	   -moz-border-radius: 15px;
+	        border-radius: 15px;
+	text-shadow: 0 1px 2px #222;
+	color: #FFF;
+	font-weight: bold;
+	line-height: 24px;
+	white-space: nowrap;
+}
+
+.fancybox-title-outside-wrap {
+	position: relative;
+	margin-top: 10px;
+	color: #fff;
+}
+
+.fancybox-title-inside-wrap {
+	padding-top: 10px;
+}
+
+.fancybox-title-over-wrap {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	color: #fff;
+	padding: 10px;
+	background: #000;
+	background: rgba(0, 0, 0, .8);
+}
+
+/*Retina graphics!*/
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+	   only screen and (min--moz-device-pixel-ratio: 1.5),
+	   only screen and (min-device-pixel-ratio: 1.5){
+
+	#fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
+		background-image: url('fancybox_sprite@2x.png');
+		background-size: 44px 152px; /*The size of the normal image, half the size of the hi-res image*/
+	}
+
+	#fancybox-loading div {
+		background-image: url('fancybox_loading@2x.gif');
+		background-size: 24px 24px; /*The size of the normal image, half the size of the hi-res image*/
+	}
+}

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

@@ -12,7 +12,7 @@ body, html{
   font-size:14px;
   line-height:22px;
   color:#666;
-  overflow-x:hidden;
+  /* overflow-x:hidden; */
   font-family: 'OpenSansRegular', sans-serif;
   overflow-y: auto !important;
   height: 100%;

data/app/controllers/carnival/admin_users_controller.rb

@@ -4,7 +4,7 @@ module Carnival
     layout "carnival/admin"
 
     def permitted_params
-      params.permit(admin_admin_user: [:name, :email, :password, :password_confirmation])
+      params.permit(carnival_admin_user: [:name, :email, :password, :password_confirmation])
     end
   end
 end

data/app/controllers/carnival/base_admin_controller.rb

@@ -19,7 +19,11 @@ module Carnival
 
       respond_to do |format|
         format.html do |render|
-          render '/carnival/index'
+          begin
+            render 'index'
+          rescue
+            render '/carnival/index'
+          end
         end
         format.json do |render|
           render(json: @datatable)
@@ -36,7 +40,13 @@ module Carnival
     def show
       @model_presenter = instantiate_presenter
       show! do |format|
-        format.html{render '/carnival/shared/form/show'}
+        format.html do |render|
+          begin
+            render 'show'
+          rescue
+            render '/carnival/shared/form/show'
+          end
+        end
       end
     end
 
@@ -44,7 +54,13 @@ module Carnival
       @model_presenter = instantiate_presenter
       new! do |format|
         @model = instance_variable_get("@#{controller_name.classify.underscore}")
-        format.html{render '/carnival/shared/form/new'}
+        format.html do |render|
+          begin
+            render 'new'
+          rescue
+            render '/carnival/shared/form/new'
+          end
+        end
       end
     end
 
@@ -52,7 +68,13 @@ module Carnival
       @model_presenter = instantiate_presenter
       edit! do |format|
         @model = instance_variable_get("@#{controller_name.classify.underscore}")
-        format.html{render '/carnival/shared/form/edit'}
+        format.html do |render|
+          begin
+            render 'edit'
+          rescue
+            render '/carnival/shared/form/edit'
+          end
+        end
       end
     end
 

data/app/datatable/carnival/generic_datatable.rb

@@ -30,7 +30,7 @@ module Carnival
 
       date_filter_field = @presenter.date_filter_field
       if(date_filter_field.present? && params[:from].present? && params[:from] != "" && params[:to].present? && params[:to] != "")
-        @model = @model.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", params[:from], params[:to])
+        @model = @model.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", "#{params[:from]} 00:00:00", "#{params[:to]} 23:59:59")
       end
 
       count = @model.count
@@ -124,12 +124,14 @@ module Carnival
 
       date_filter_field = @presenter.date_filter_field
       if(date_filter_field.present? && params[:from].present? && params[:from] != "" && params[:to].present? && params[:to] != "")
-        @model = @model.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", params[:from], params[:to])
+        @model = @model.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", "#{params[:from]} 00:00:00", "#{params[:to]} 23:59:59")
         add_filter 'Período',"#{params[:from]} - #{params[:to]}"
       end
 
       records = records.order("#{@presenter.table_name}.#{sort_column} #{sort_direction}")
-      records = records.page(page).per_page(per_page)
+      if params['format'] == 'json'
+        records = records.page(page).per_page(per_page)
+      end
       filtros = []
       if params[:advancedquery].present?
         records = @presenter.parse_advanced_search(records, params[:advancedquery])

data/app/helpers/carnival/base_admin_helper.rb

@@ -64,8 +64,14 @@ module Carnival
           return link_to presenter.relation_label(field.to_sym, record), presenter.relation_path(field.to_sym, record)
         end
       else
-        result = record.send(field)
-        return result.strftime("%d/%m/%y %H:%M:%S") if current_type == :date
+        result = record.send(field.to_s)
+        if current_type == :date
+          if result.nil?
+            return result
+          else
+            return result.strftime("%d/%m/%y %H:%M:%S")
+          end
+        end
         return number_with_precision(result, :precision => 2, :separator => ",") if current_type == :number
         return record.class.const_get(field.to_s.upcase)[result] if current_type == :enum
         result

data/app/models/carnival/action.rb

@@ -16,12 +16,12 @@ module Carnival
     def path(extra_params={})
       if @path.nil?
         params = {controller: @presenter.controller_name, action: @name}
-        params = params.merge(extra_params) if extra_params.present?
-        params = params.merge(:only_path => true)
-        url_for(params)
       else
-        @path
+        params = {path: @path}
       end
+      params = params.merge(extra_params) if extra_params.present?
+      params = params.merge(:only_path => true)
+      url_for(params)
     end
 
     def partial

data/app/models/carnival/admin_user.rb

@@ -1,10 +1,8 @@
 module Carnival
+
   class AdminUser < ActiveRecord::Base
-    # Include default devise modules. Others available are:
-    # :confirmable, :lockable, :timeoutable and :omniauthable
-    devise :database_authenticatable, :registerable,
-           :recoverable, :rememberable, :trackable, :validatable,
-           :omniauthable, :omniauth_providers => [:facebook, :google_oauth2]
+
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
 
     has_many :admin_user_notifications
 
@@ -37,4 +35,5 @@ module Carnival
       end
     end
   end
+
 end