adminpanel 2.0.1 → 2.1.0

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

@@ -6,7 +6,7 @@
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li class='dropdown'>" +
               "<a class='btn dropdown-toggle" + size + "' data-toggle='dropdown' href='#'>" +
-              "<i class='icon-font'></i>&nbsp;<span class='current-font'>" + locale.font_styles.normal + "</span>&nbsp;<b class='caret'></b>" +
+              "<i class='fa fa-font'></i>&nbsp;<span class='current-font'>" + locale.font_styles.normal + "</span>&nbsp;<b class='caret'></b>" +
               "</a>" +
               "<ul class='dropdown-menu'>" +
                 "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div' tabindex='-1'>" + locale.font_styles.normal + "</a></li>" +
@@ -24,9 +24,9 @@
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li>" +
               "<div class='btn-group'>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='bold' title='CTRL+B' tabindex='-1'>" + locale.emphasis.bold + "</a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='italic' title='CTRL+I' tabindex='-1'>" + locale.emphasis.italic + "</a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='underline' title='CTRL+U' tabindex='-1'>" + locale.emphasis.underline + "</a>" +
+                "<a class='btn' data-wysihtml5-command='bold' title='CTRL+B' tabindex='-1'><i class='fa fa-bold'></i></a>" +
+                "<a class='btn' data-wysihtml5-command='italic' title='CTRL+I' tabindex='-1'><i class='fa fa-italic'></i></a>" +
+                "<a class='btn' data-wysihtml5-command='underline' title='CTRL+U' tabindex='-1'><i class='fa fa-underline'></i></a>" +
               "</div>" +
             "</li>";
         },
@@ -35,10 +35,10 @@
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li>" +
               "<div class='btn-group'>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='insertUnorderedList' title='" + locale.lists.unordered + "' tabindex='-1'><i class='icon-list'></i></a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='insertOrderedList' title='" + locale.lists.ordered + "' tabindex='-1'><i class='icon-th-list'></i></a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='Outdent' title='" + locale.lists.outdent + "' tabindex='-1'><i class='icon-indent-right'></i></a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='Indent' title='" + locale.lists.indent + "' tabindex='-1'><i class='icon-indent-left'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-command='insertUnorderedList' title='" + locale.lists.unordered + "' tabindex='-1'><i class='fa fa-list-ul'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-command='insertOrderedList' title='" + locale.lists.ordered + "' tabindex='-1'><i class='fa fa-list-ol'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-command='Outdent' title='" + locale.lists.outdent + "' tabindex='-1'><i class='fa fa-outdent'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-command='Indent' title='" + locale.lists.indent + "' tabindex='-1'><i class='fa fa-indent'></i></a>" +
               "</div>" +
             "</li>";
         },
@@ -88,7 +88,7 @@
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li>" +
               "<div class='btn-group'>" +
-                "<a class='btn" + size + "' data-wysihtml5-action='change_view' title='" + locale.html.edit + "' tabindex='-1'><i class='icon-pencil'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-action='change_view' title='" + locale.html.edit + "' tabindex='-1'><i class='fa fa-pencil'></i></a>" +
               "</div>" +
             "</li>";
         },

data/app/assets/javascripts/adminpanel/realm.js

@@ -1,9 +1,9 @@
 
-$(function() {
+var ready = function(){
 
-  // toggle arrow on menu items 
+  // toggle arrow on menu items
   $('.accordion-heading .accordion-toggle').click(function(){
-    $('.accordion-heading .accordion-toggle').not($(this)[0], '.accordion-heading .accordion-toggle.collapse').addClass('collapsed'); 
+    $('.accordion-heading .accordion-toggle').not($(this)[0], '.accordion-heading .accordion-toggle.collapse').addClass('collapsed');
   });
 
 
@@ -26,7 +26,7 @@ $(function() {
   });
 
 
-  // funtion to slide menu out from the left 
+  // funtion to slide menu out from the left
   $('.slide_menu_left').click(function(e){
 
     e.preventDefault();
@@ -43,7 +43,7 @@ $(function() {
      //  $(window).bind('resize', handler);
     }
   });
-  
+
 
   // collapse function for the widget
   $('.widget-buttons a.collapse').click(function(){
@@ -57,10 +57,14 @@ $(function() {
   });
 
   $('.datepicker-basic').datepicker();
-}); // end document reday
 
+};
+
+$(document).ready(ready);
+$(document).on('page:load', ready);
 
-//-----  Side menu functions -----//
+
+//-----  Side menu functions -----
 
   // slide menu out of view
   function sidemenu_close(){
@@ -84,4 +88,4 @@ $(function() {
       $(".nav-collapse.collapse").stop().animate({
           'left': '0'
       }, 250, 'swing').addClass('open_left');
-  } 
+  }

data/app/assets/javascripts/adminpanel/spinner.js.coffee

@@ -0,0 +1,11 @@
+$(document).on 'click', 'a.accordion-toggle', ->
+  $( this ).attr('data-clicked', true)
+
+$(document).on 'page:fetch', ->
+  $('a.accordion-toggle[data-clicked="true"]').children('i:first').toggleClass('hidden')
+  $('a.accordion-toggle[data-clicked="true"]').prepend('<i class="fa fa-spinner fa-spin"></i>')
+
+$(document).on 'page:restore', ->
+  $('a.accordion-toggle[data-clicked="true"]').children('i:first').remove()
+  $('a.accordion-toggle[data-clicked="true"]').children('i:first').toggleClass 'hidden'
+  $('a.accordion-toggle[data-clicked="true"]').attr 'data-clicked', false

data/app/assets/javascripts/adminpanel/wysiwyg.js.coffee

@@ -0,0 +1,3 @@
+$(document).ready ->
+  $('.wysihtml5').each (i, elem) ->
+    $(elem).wysihtml5()

data/app/assets/javascripts/application-admin.js

@@ -15,3 +15,4 @@
 //= require turbolinks
 //= require adminpanel/bootstrap
 //= require_tree ./adminpanel/.
+Turbolinks.enableTransitionCache();

data/app/assets/stylesheets/adminpanel/{bootstrap.css → bootstrap.css.erb}

@@ -2368,7 +2368,7 @@ input[type="submit"].btn.btn-mini {
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("glyphicons-halflings.png");
+  background-image: url(asset_path 'adminpanel/glyphicons-halflings.png');
   background-position: 14px 14px;
   background-repeat: no-repeat;
   margin-top: 1px;
@@ -2387,7 +2387,7 @@ input[type="submit"].btn.btn-mini {
 .dropdown-menu > .active > a > [class*=" icon-"],
 .dropdown-submenu:hover > a > [class^="icon-"],
 .dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: url("glyphicons-halflings-white.png");
+  background-image: url(asset_path 'adminpanel/glyphicons-halflings-white.png');
 }
 .icon-glass {
   background-position: 0      0;

data/app/assets/stylesheets/adminpanel/{theme.css → theme.css.erb}

@@ -12,7 +12,7 @@ html, body{
 body{
   padding-top: 45px;
   font-family: 'Open Sans', sans-serif;
-  background-image: url("dotted.png");
+  background-image: url(<%= asset_path 'adminpanel/dotted.png' %>);
   overflow-x: hidden;
 }
 h2{
@@ -307,12 +307,12 @@ table.table thead .sorting_desc_disabled {
   cursor: pointer;
   *cursor: hand;
 }
-table.table thead .sorting { background: url('sort_both.png') no-repeat center right; }
-table.table thead .sorting_asc { background: url('sort_asc.png') no-repeat center right; }
-table.table thead .sorting_desc { background: url('sort_desc.png') no-repeat center right; }
+table.table thead .sorting { background: url(<%= asset_path 'adminpanel/sort_both.png' %>) no-repeat center right; }
+table.table thead .sorting_asc { background: url(<%= asset_path 'adminpanel/sort_asc.png' %>) no-repeat center right; }
+table.table thead .sorting_desc { background: url(<%= asset_path 'adminpanel/sort_desc.png' %>) no-repeat center right; }
 
-table.table thead .sorting_asc_disabled { background: url('sort_asc_disabled.png') no-repeat center right; }
-table.table thead .sorting_desc_disabled { background: url('sort_desc_disabled.png') no-repeat center right; }
+table.table thead .sorting_asc_disabled { background: url(<%= asset_path 'adminpanel/sort_asc_disabled.png' %>) no-repeat center right; }
+table.table thead .sorting_desc_disabled { background: url(<%= asset_path 'adminpanel/sort_desc_disabled.png' %>) no-repeat center right; }
 .dataTables_filter{
   text-align: right;
 }

data/app/controllers/adminpanel/analytics_controller.rb

@@ -62,7 +62,7 @@ module Adminpanel
         )
 
 				@visits = @visitCount.data.rows.collect do |r|
-				  	r[2]
+			  	r[2]
 				end
 
 				@visitDates = @visitCount.data.rows.collect { |r| "#{r[0]}/#{r[1]}" }
@@ -73,5 +73,6 @@ module Adminpanel
         format.json {render :json => {:visit_count => @visitCount, :visits => @visits, :visit_dates => @visitDates }}
       end
 		end
+
 	end
 end

data/app/controllers/adminpanel/application_controller.rb

@@ -7,6 +7,7 @@ module Adminpanel
     include SessionsHelper
     include Adminpanel::RestActions
     include Adminpanel::GalleryzableActions
+    include Adminpanel::FacebookActions
 
     layout 'admin'
 

data/app/controllers/adminpanel/auths_controller.rb

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

data/app/controllers/adminpanel/categories_controller.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   class CategoriesController < ApplicationController
-    load_and_authorize_resource
+    authorize_resource
 
     def index
       @categories = Category.all

data/app/controllers/adminpanel/galleries_controller.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   class GalleriesController < Adminpanel::ApplicationController
-    load_and_authorize_resource
+    authorize_resource
 
     def index
       @galleries = Gallery.all
@@ -26,11 +26,7 @@ module Adminpanel
 
     def move_better
       @gallery = Gallery.find(params[:id])
-      if @gallery.move_to_better_position
-        flash[:success] = t("gallery.moved")
-      else
-        flash[:warning] = t("gallery.not-moved")
-      end
+      @gallery.move_to_better_position
       respond_to do |format|
         format.html do
           redirect_to galleries_path
@@ -44,11 +40,7 @@ module Adminpanel
 
     def move_worst
       @gallery = Gallery.find(params[:id])
-      if @gallery.move_to_worst_position
-        flash[:success] = t("gallery.moved")
-      else
-        flash[:warning] = t("gallery.not-moved")
-      end
+      @gallery.move_to_worst_position
       respond_to do |format|
         format.html do
           redirect_to galleries_path

data/app/controllers/adminpanel/sections_controller.rb

@@ -1,19 +1,10 @@
 module Adminpanel
   class SectionsController < Adminpanel::ApplicationController
-    load_and_authorize_resource
-
-    def new
-      @section = Section.new
-    end
-
-    # def create
-    #   @section = Section.new(params[:section])
-
-    #   if @section.save
-    #     redirect_to section_path(@section), :notice => 'La seccion ha sido creada'
-    #   else
-    #     render 'new'
-    #   end
+    # authorize_resource
+    authorize_resource
+    # def new
+    #   @section = Section.new
+    #   authorize! :create, @section
     # end
 
     def edit

data/app/controllers/adminpanel/users_controller.rb

@@ -1,7 +1,7 @@
 module Adminpanel
   class UsersController < Adminpanel::ApplicationController
     # authorize_resource :class => false
-    load_and_authorize_resource
+    authorize_resource
 
   private
     def user_params

data/app/controllers/concerns/adminpanel/facebook_actions.rb

@@ -0,0 +1,64 @@
+module Adminpanel
+  module FacebookActions
+    extend ActiveSupport::Concern
+    include ActionView::Helpers::TextHelper
+
+    included do
+      before_filter :set_auths_count, only:[:index, :show, :destroy]
+    end
+
+    def fb_choose_page
+      access_token = Koala::Facebook::OAuth.new(
+        Adminpanel.fb_app_id,
+        Adminpanel.fb_app_secret,
+        url_for({
+          controller: params[:controller],
+          action: :fb_choose_page,
+          id: resource,
+          host: request.host
+        })
+      ).get_access_token(params[:code]) if params[:code]
+      user = Koala::Facebook::API.new(access_token)
+      @pages = user.get_connections('me', 'accounts')
+      user_object = user.get_object('me')
+      @name = user_object['name']
+      user_hash = { 'name' => @name, 'access_token' => access_token }
+      @pages << user_hash # to permit post on own profile
+      render 'shared/fb_choose_page'
+    end
+
+    def fb_save_token
+      page_selected = Koala::Facebook::API.new(params[@model.name.demodulize.downcase][:fb_page_access_key])
+      @auths = Auth.where(key: 'facebook', name: page_selected.get_object('me')['name'])
+      if @auths.count == 0
+        Auth.create(
+          key: 'facebook',
+          name: page_selected.get_object('me')['name'],
+          value: params[@model.name.demodulize.downcase][:fb_page_access_key]
+        )
+      else
+        @auths.first.update_attribute(:value, params[@mode.name.demodulize.downcase][:fb_page_access_key])
+      end
+      flash[:success] = I18n.t('fb.saved-token')
+      redirect_to resource
+    end
+
+    def fb_publish
+      page_graph = Koala::Facebook::API.new(Auth.find_by_key('facebook').value)
+      page_graph.put_wall_post(
+        strip_tags(params[@model.name.demodulize.downcase][:fb_message]),
+        {
+          link: resource.fb_link,
+          name: resource.name
+        }
+      )
+      flash[:success] = I18n.t('fb.posted', user: page_graph.get_object('me')['name'])
+      redirect_to resource
+    end
+
+  private
+    def set_auths_count
+      @fb_auths_count = Auth.where(key: 'facebook').count
+    end
+  end
+end

data/app/controllers/concerns/adminpanel/galleryzable_actions.rb

@@ -3,28 +3,26 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     def move_better
-      respond_to do |format|
-        format.js do
-          resource = @model.find(params[:id])
-          resource.move_to_better_position
-          render 'shared/gallery_entries', :locals => {
-            :collection => @model.where(
-              @model.relation_field.to_sym => resource.send(@model.relation_field)
-            )
-          }
-        end
-      end
+      resource = @model.find(params[:id])
+      resource.move_to_better_position
+      respond
+
     end
 
     def move_worst
+      resource = @model.find(params[:id])
+      resource.move_to_worst_position
+      respond
+    end
+
+  private
+    def respond
       respond_to do |format|
         format.js do
-          resource = @model.find(params[:id])
-          resource.move_to_worst_position
           render 'shared/gallery_entries', :locals => {
             :collection => @model.where(
               @model.relation_field.to_sym => resource.send(@model.relation_field)
-              )
+            )
           }
         end
       end

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -86,13 +86,13 @@ module Adminpanel
     end
 
     def set_belongs_to_collections
-      @model.belongs_to_relationships.each do |class_variable|
+      @model.relationships_of('belongs_to').each do |class_variable|
         set_relationship(class_variable)
       end
     end
 
     def set_has_many_collections
-      @model.has_many_relationships.each do |class_variable|
+      @model.relationships_of('has_many').each do |class_variable|
         set_relationship(class_variable)
       end
     end

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -4,6 +4,7 @@ module Adminpanel
 		alias_method :text_field_original, :text_field
 		alias_method :radio_button_original, :radio_button
 		alias_method :parent_file_field, :file_field
+		alias_method :text_area_original, :text_area
 
 		def text_field(name, *args)
 			options = args.extract_options!
@@ -76,7 +77,7 @@ module Adminpanel
 			@template.content_tag(:div, :class => 'control-group') do
 				@template.content_tag(:label, label, :class => 'control-label') +
 				@template.content_tag(:div, :class => 'controls') do
-					self.text_area(
+					text_area_original(
 						name,
 						class: 'wysihtml5 span10',
 						placeholder: I18n.t('wysiwyg.description'),
@@ -86,8 +87,25 @@ module Adminpanel
 			end
 		end
 
-		def radio_button_group(name, buttons, options)
+		def text_area(name, *args)
+			options = args.extract_options!
+			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, :class => 'controls') do
+					super(
+						name,
+						class: 'span10',
+						placeholder: I18n.t('wysiwyg.description'),
+						rows: '4'
+					)
+				end
+			end
+		end
+
+		def radio_button_group(name, buttons, options)
 			options.reverse_merge! :label => name
 			options.reverse_merge! :html => {}
 			output = ""