adminpanel 2.1.5 → 2.1.6

data/app/assets/javascripts/adminpanel/bootstrap-timepicker.js

@@ -700,16 +700,16 @@
             }
             var templateContent = '<table class="'+ (this.showSeconds ? 'show-seconds' : '') +' '+ (this.showMeridian ? 'show-meridian' : '') +'">'+
                                        '<tr>'+
-                                           '<td><a href="#" data-action="incrementHour"><i class="icon-chevron-up"></i></a></td>'+
+                                           '<td><a href="#" data-action="incrementHour"><i class="fa fa-chevron-up"></i></a></td>'+
                                            '<td class="separator">&nbsp;</td>'+
-                                           '<td><a href="#" data-action="incrementMinute"><i class="icon-chevron-up"></i></a></td>'+
+                                           '<td><a href="#" data-action="incrementMinute"><i class="fa fa-chevron-up"></i></a></td>'+
                                            (this.showSeconds ?
                                                '<td class="separator">&nbsp;</td>'+
-                                               '<td><a href="#" data-action="incrementSecond"><i class="icon-chevron-up"></i></a></td>'
+                                               '<td><a href="#" data-action="incrementSecond"><i class="fa fa-chevron-up"></i></a></td>'
                                            : '') +
                                            (this.showMeridian ?
                                                '<td class="separator">&nbsp;</td>'+
-                                               '<td class="meridian-column"><a href="#" data-action="toggleMeridian"><i class="icon-chevron-up"></i></a></td>'
+                                               '<td class="meridian-column"><a href="#" data-action="toggleMeridian"><i class="fa fa-chevron-up"></i></a></td>'
                                            : '') +
                                        '</tr>'+
                                        '<tr>'+
@@ -726,16 +726,16 @@
                                            : '') +
                                        '</tr>'+
                                        '<tr>'+
-                                           '<td><a href="#" data-action="decrementHour"><i class="icon-chevron-down"></i></a></td>'+
+                                           '<td><a href="#" data-action="decrementHour"><i class="fa fa-chevron-down"></i></a></td>'+
                                            '<td class="separator"></td>'+
-                                           '<td><a href="#" data-action="decrementMinute"><i class="icon-chevron-down"></i></a></td>'+
+                                           '<td><a href="#" data-action="decrementMinute"><i class="fa fa-chevron-down"></i></a></td>'+
                                            (this.showSeconds ?
                                                 '<td class="separator">&nbsp;</td>'+
-                                                '<td><a href="#" data-action="decrementSecond"><i class="icon-chevron-down"></i></a></td>'
+                                                '<td><a href="#" data-action="decrementSecond"><i class="fa fa-chevron-down"></i></a></td>'
                                            : '') +
                                            (this.showMeridian ?
                                                 '<td class="separator">&nbsp;</td>'+
-                                                '<td><a href="#" data-action="toggleMeridian"><i class="icon-chevron-down"></i></a></td>'
+                                                '<td><a href="#" data-action="toggleMeridian"><i class="fa fa-chevron-down"></i></a></td>'
                                            : '') +
                                        '</tr>'+
                                    '</table>';

data/app/controllers/adminpanel/auths_controller.rb

@@ -1,8 +1,8 @@
 module Adminpanel
   class AuthsController < ApplicationController
   private
-  def auth_params
-    params.require(:auth).permit(:name, :value, :key, :fb_page_access_key)
-  end
+    def auth_params
+      params.require(:auth).permit(:name, :value, :key)
+    end
   end
 end

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -8,51 +8,24 @@ module Adminpanel
     alias_method :number_field_original, :number_field
     alias_method :email_field_original, :email_field
     alias_method :file_field_original, :file_field
+    # alias_method :select_original, :select
 
     def text_field(name, *args)
-      input_layout( name, *args, 'text_field_original' )
+      base_layout( name, *args, 'text_field_original' )
     end
 
     def file_field(name, *args)
-      image = input_layout(name, *args, 'file_field_original')
+      image_input = base_layout(name, *args, 'file_field_original')
 
-      if object.nil? || object.new_record?
-        image
+      if !object.nil? && !object.new_record? #if not new record
+        "#{thumbnail_layout(name)}#{image_input}".html_safe
       else
-        thumbnail = @template.content_tag :div, :class => 'control-group' do
-          @template.content_tag :div, :class => 'controls' do
-            @template.image_tag object.send("#{name}_url", :thumb)
-          end
-        end
-        "#{thumbnail}#{image}".html_safe
-
+        image_input
       end
     end
 
     def gallery_field(name, *args)
-      options = args.extract_options!
-      label = options['label']
-      options.delete('label')
-
-      @template.content_tag :div, :class => "control-group" do
-        label = @template.content_tag(:label, label, :class => "control-label")
-        input = @template.content_tag :div, :class => "controls" do
-          input = file_field_original(name, *args << options)
-          hidden_input = hidden_field(:_destroy)
-          delete_button = @template.content_tag(:button, I18n.t("action.delete"), :class => "btn btn-danger remove_fields")
-
-          if object.nil? || object.new_record?
-            "#{input}#{hidden_input}#{delete_button}".html_safe
-          else
-            thumbnail = @template.content_tag :div, :class => 'control-group' do
-              @template.image_tag object.send("#{name}_url", :thumb)
-            end
-
-            "#{thumbnail}#{input}#{hidden_input}#{delete_button}".html_safe
-          end
-        end
-        "#{label}#{input}".html_safe
-      end
+      base_layout(name, *args, 'gallery_base')
     end
 
     def wysiwyg_field(name, *args)
@@ -60,11 +33,11 @@ module Adminpanel
       options = args.extract_options!
       options.reverse_merge! class: 'wysihtml5 span7'
 
-      input_layout( name, options, 'text_area_original' )
+      base_layout( name, options, 'text_area_original' )
     end
 
     def text_area(name, *args)
-      input_layout( name, *args, 'text_area_original' )
+      base_layout( name, *args, 'text_area_original' )
     end
 
     # def radio_button_group(name, buttons, options)
@@ -95,27 +68,7 @@ module Adminpanel
     end
 
     def boolean(name, *args)
-      options = args.extract_options!
-
-      @template.content_tag(
-        :div,
-        @template.content_tag(
-          :div,
-          options['label'],
-          :class => 'control-label') +
-          @template.content_tag(
-            :div,
-            @template.content_tag(
-              :label,
-              check_box(
-                name
-              ),
-              :class => 'checkbox'
-            ),
-            :class => 'controls'
-          ),
-        :class => 'control-group'
-      )
+      base_layout(name, *args, 'boolean_base')
     end
 
     def select(name, select_options, *args)
@@ -132,15 +85,15 @@ module Adminpanel
     end
 
     def number_field(name, *args)
-      input_layout( name, *args, 'number_field_original' )
+      base_layout( name, *args, 'number_field_original' )
     end
 
     def password_field(name, *args)
-      input_layout( name, *args, 'password_field_original' )
+      base_layout( name, *args, 'password_field_original' )
     end
 
     def email_field(name, *args)
-      input_layout( name, *args, 'email_field_original' )
+      base_layout( name, *args, 'email_field_original' )
     end
 
     def submit(name, *args)
@@ -150,110 +103,125 @@ module Adminpanel
       super(name, *args << options)
     end
 
-    def datepicker(name, *args)
-
-      options = args.extract_options!
 
-      options.reverse_merge! :value => Time.now.strftime("%d-%m-%Y")
-      options.reverse_merge! :label => name
-      label = options['label']
-      options.delete('label')
-
-      @template.content_tag :div, :class => "control-group" do
-        @template.content_tag(:label, label, :class => "control-label") +
-        @template.content_tag(
-          :div,
-          @template.content_tag(
-            :div,
-            text_field_original(name, *args << options) +
-            @template.content_tag(
-              :span,
-              @template.content_tag(
-                :i,
-                nil,
-                :class => "fa fa-th"
-              ),
-              :class => "add-on"
-            ),
-            {
-              :class => "input-append date span5 datepicker datepicker-basic",
-              :data => {
-                :date_format => "dd-mm-yyyy",
-                :date => options[:value]
-              }
-            }
-          ),
-          :class => "controls"
-        )
-      end
+    def datepicker(name, *args)
+      base_layout( name, *args, 'datepickerize_base' )
     end
 
-    def prepend_field(name, *args)
+    # def prepend_field(name, *args)
+    #
+    #   options = args.extract_options!
+    #
+    #   options.reverse_merge! :label => name
+    #   label = options['label']
+    #   options.delete('label')
+    #
+    #   options.reverse_merge! :symbol => "#"
+    #   symbol = options[:symbol]
+    #   options.delete(:symbol)
+    #
+    #   @template.content_tag :div, :class => "control-group" do
+    #     @template.content_tag(:label, label, :class => "control-label") +
+    #     @template.content_tag(
+    #       :div,
+    #       @template.content_tag(
+    #         :div,
+    #         @template.content_tag(:span, symbol, :class => "add-on") +
+    #         text_field_original(name, *args << options),
+    #         :class => "input-prepend"
+    #       ),
+    #       :class => "controls"
+    #     )
+    #   end
+    # end
+    #
+    # def append_field(name, *args)
+    #
+    #   options = args.extract_options!
+    #
+    #   options.reverse_merge! :label => name
+    #   label = options['label']
+    #   options.delete('label')
+    #
+    #   options.reverse_merge! :symbol => "#"
+    #   symbol = options[:symbol]
+    #   options.delete(:symbol)
+    #
+    #   @template.content_tag :div, :class => "control-group" do
+    #     @template.content_tag(:label, label, :class => "control-label") +
+    #     @template.content_tag(
+    #       :div,
+    #       @template.content_tag(
+    #         :div,
+    #         text_field_original(name, *args << options) +
+    #         @template.content_tag(:span, symbol, :class => "add-on"),
+    #         :class => "input-append"
+    #       ),
+    #       :class => "controls"
+    #     )
+    #   end
+    # end
 
-      options = args.extract_options!
+    private
 
-      options.reverse_merge! :label => name
+    def base_layout(name, *args, input_type)
+      options = args.extract_options!
+      options.reverse_merge! class: 'span7'
       label = options['label']
       options.delete('label')
 
-      options.reverse_merge! :symbol => "#"
-      symbol = options[:symbol]
-      options.delete(:symbol)
+      @template.content_tag :div, :class => 'control-group' do
+        @template.content_tag(:label, label, :class => 'control-label') +
+        @template.content_tag(:div, :class => 'controls') do
+          self.send(input_type, name, options)
+        end
+      end
+    end
 
-      @template.content_tag :div, :class => "control-group" do
-        @template.content_tag(:label, label, :class => "control-label") +
-        @template.content_tag(
-          :div,
-          @template.content_tag(
-            :div,
-            @template.content_tag(:span, symbol, :class => "add-on") +
-            text_field_original(name, *args << options),
-            :class => "input-prepend"
-          ),
-          :class => "controls"
+    def datepickerize_base(name, options)
+      options.reverse_merge! 'value' => Time.now.strftime("%d-%m-%Y")
+      @template.content_tag(
+                :div,
+                class: 'input-append date datepicker datepicker-basic',
+                data: {
+                  date_format: 'dd-mm-yyyy',
+                  date: options['value']
+                }
+              ) do
+        text_field_original(name, options) +
+        (
+          @template.content_tag :span, class: 'add-on' do
+            @template.content_tag :i, nil, class: 'fa fa-th'
+          end
         )
       end
     end
 
-    def append_field(name, *args)
-
-      options = args.extract_options!
-
-      options.reverse_merge! :label => name
-      label = options['label']
-      options.delete('label')
+    def boolean_base(name, options)
+      @template.content_tag :label, class: 'checkbox' do
+        check_box(name)
+      end
+    end
 
-      options.reverse_merge! :symbol => "#"
-      symbol = options[:symbol]
-      options.delete(:symbol)
+    def gallery_base(name, options)
+      file_field_input = file_field_original(name, options)
+      hidden_input = hidden_field(:_destroy)
+      delete_button = @template.content_tag(:button, I18n.t("action.delete"), :class => "btn btn-danger remove_fields")
 
-      @template.content_tag :div, :class => "control-group" do
-        @template.content_tag(:label, label, :class => "control-label") +
-        @template.content_tag(
-          :div,
-          @template.content_tag(
-            :div,
-            text_field_original(name, *args << options) +
-            @template.content_tag(:span, symbol, :class => "add-on"),
-            :class => "input-append"
-          ),
-          :class => "controls"
-        )
+      if object.nil? || object.new_record?
+        "#{file_field_input}#{hidden_input}#{delete_button}".html_safe
+      else
+        "#{thumbnail_layout(name)}#{file_field_input}#{hidden_input}#{delete_button}".html_safe
       end
     end
 
-    def input_layout(name, *args, parent_method)
-      options = args.extract_options!
-      options.reverse_merge! class: 'span7'
-      label = options['label']
-      options.delete('label')
-
+    def thumbnail_layout(attribute)
       @template.content_tag :div, :class => 'control-group' do
-        @template.content_tag(:label, label, :class => 'control-label') +
-        @template.content_tag(:div, :class => 'controls') do
-          self.send(parent_method, name, options)
+        @template.content_tag :div, :class => 'controls' do
+          @template.image_tag self.object.send("#{attribute}_url", :thumb)
         end
       end
     end
+
   end
 end

data/app/models/concerns/adminpanel/sitemap.rb

@@ -9,10 +9,10 @@ module Adminpanel
       after_destroy :ping_engines
     end
 
+  private
     def ping_urls
       {
         google: "http://www.google.com/webmasters/tools/ping?sitemap=%s",
-        ask: "http://submissions.ask.com/ping?sitemap=%s",
         bing: "http://www.bing.com/webmaster/ping.aspx?siteMap=%s"
       }
     end
@@ -21,8 +21,9 @@ module Adminpanel
       logger.info Time.now
       ping_urls.each do |name, url|
         request = url % CGI.escape("#{root_url}/sitemap.xml")
+        logger.info root_url
         logger.info "  Pinging #{name} with #{request}"
-        if Rails.env == "production"
+        if Rails.env != "development"
           response = Net::HTTP.get_response(URI.parse(request))
           logger.info "    #{response.code}: #{response.message}"
           logger.info "    Body: #{response.body}"

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -477,7 +477,7 @@ files:
 - app/assets/stylesheets/adminpanel/alertify.css
 - app/assets/stylesheets/adminpanel/bootstrap-wysihtml5.css
 - app/assets/stylesheets/adminpanel/bootstrap.css.erb
-- app/assets/stylesheets/adminpanel/datepicker.css
+- app/assets/stylesheets/adminpanel/datepicker.min.css
 - app/assets/stylesheets/adminpanel/facybox.css
 - app/assets/stylesheets/adminpanel/fullcalendar.css
 - app/assets/stylesheets/adminpanel/fullcalendar.print.css