adminpanel 1.2.8 → 1.2.9

data/app/models/adminpanel/section.rb

@@ -29,8 +29,12 @@ module Adminpanel
 
 		end
 
-	  def simple_name
-	  	"Section"
+	  def self.icon
+	  	"icon-tasks"
 	  end
+
+		def self.display_name
+			'Secciones'
+		end
 	end
 end

data/app/models/adminpanel/user.rb

@@ -42,6 +42,10 @@ module Adminpanel
 
     end
 
+    def self.icon
+      'icon-user'
+    end
+
     private
       def create_remember_token
         self.remember_token = SecureRandom.base64.tr("+/", "-_")

data/app/views/adminpanel/sessions/new.html.erb

@@ -23,4 +23,4 @@
 			<%= f.submit "Iniciar Sesión", :class => "btn pull-right", :id => "signin-button" %>
 		<% end %>
 	</div>
-</div>
+</div>

data/app/views/layouts/_side_menu.html.erb

@@ -12,42 +12,8 @@
 		%>
 	</div>
 	<div class="accordion" id="accordion2">
-
-		<% if !Adminpanel.unincluded_modules.include?(:analytics) %>
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%=
-					link_to(
-						content_tag(
-							:i,
-							nil,
-							:class => 'icon-dashboard') +
-							content_tag(:span," #{I18n.t('model.Analytics')}"),
-						pages_path,
-						:class => "accordion-toggle b_D1B2D1 #{is_current_section?('pages')}"
-						)
-					%>
-				</div>
-			</div>
-		<% end %>
-
-		<div class="accordion-group">
-			<div class="accordion-heading">
-				<%=
-				link_to(
-					content_tag(
-						:i,
-						nil,
-						:class => 'icon-user') +
-						content_tag(:span,' Usuarios'),
-					users_path,
-					:class => "accordion-toggle b_9FDDF6 #{is_current_section?('users')}"
-					)
-				%>
-			</div>
-		</div>
-
-		<% if !Adminpanel.unincluded_modules.include?(:gallery) %>
+		<% Adminpanel.displayable_resources.each do |resource| %>
+			<% resource_class = symbol_class(resource) %>
 			<div class="accordion-group">
 				<div class="accordion-heading">
 					<%=
@@ -55,65 +21,17 @@
 						content_tag(
 							:i,
 							nil,
-							:class => 'icon-picture') +
-							content_tag(:span, " #{t('model.Gallery')}"),
-						galleries_path,
-						:class => "accordion-toggle b_C3F7A7 #{is_current_section?('galleries')}"
-					)
-					%>
-				</div>
-			</div>
-		<% end %>
-
-		<% if !Adminpanel.unincluded_modules.include?(:sections) %>
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%=
-					link_to(
-						content_tag(:i, nil, :class => 'icon-tasks') +
-							content_tag(:span, ' Secciones'),
-						sections_path,
-						:class => "accordion-toggle b_F6F1A2 #{is_current_section?('sections')}"
-					)
-					%>
-				</div>
-			</div>
-		<% end %>
-
-		<% if !Adminpanel.unincluded_modules.include?(:categories) %>
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%=
-					link_to(
-						content_tag(:i, nil, :class => 'icon-bookmark') +
-							content_tag(:span, " #{t('model.Categories')}"),
-						categories_path,
-						:class => "accordion-toggle b_99FFCC #{is_current_section?('categories')}"
+							:class => resource_class.icon) +
+							content_tag(:span," #{resource_class.display_name}"),
+						[route_symbol(resource.to_s)],
+						:class => "accordion-toggle b_99FFCC
+							#{is_current_section?(resource_class.display_name)}"
 					)
 					%>
 				</div>
 			</div>
 		<% end %>
 
-
-		<% @menu_items.each do |menu| %>
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%=
-					link_to content_tag(
-						:i,
-						nil,
-						:class => "Adminpanel::#{menu}".constantize.icon
-					) + content_tag(
-						:span,
-						" " + pluralize_es("Adminpanel::#{menu}".constantize.display_name)
-					),
-					[route_symbol(menu)],
-					:class => "accordion-toggle b_F5C294 #{is_current_section?(menu)}"
-					%>
-				</div>
-			</div>
-		<% end %>
 	</div>
 </div>
 <!-- /Side menu -->

data/app/views/shared/_gallery_entries.html.erb

@@ -0,0 +1,11 @@
+<% images.each do |image| %>
+  <li>
+    <%= link_to (image_tag image.file_url(:thumb)), image.file.to_s, :rel  => "group", :name => @model.display_name %>
+    <ul class="rightboxes">
+      <li>
+        <%= link_to content_tag(:i, nil, :class => "icon-chevron-up"), [:move_to_better, image], :method => :put, :remote => true %>
+        <%= link_to content_tag(:i, nil, :class => "icon-chevron-down"), [:move_to_worst, image], :method => :put, :remote => true %>
+      </li>
+    </ul>
+  </li>
+<% end %>

data/app/views/shared/gallery_entries.js.erb

@@ -0,0 +1 @@
+$('#gallery-entries').html("<%= escape_javascript(render 'shared/gallery_entries', :images => collection) %>")

data/app/views/shared/show.html.erb

@@ -18,7 +18,7 @@
       <div class="widget-body">
         <div class="widget-tickets widget-tickets-large clearfix"><ul>
           <% @model.display_attributes.each do |fields| %>
-          <% fields.each do |attribute, properties| %>
+           <% fields.each do |attribute, properties| %>
             <% if properties["type"] != "adminpanel_file_field" %>
             <li class="priority-high">
               <div class="span3">
@@ -36,6 +36,10 @@
                       <li class="priority-low"><%= member.name %></li>
                     <% end %>
                   </ul>
+                <% elsif properties['type'] == 'file_field' %>
+                  <ul>
+                    <%= image_tag(resource.send("#{attribute}_url", :thumb)) %>
+                  </ul>
                 <% else %>
                   <%= resource.send(attribute) -%>
                 <% end %>
@@ -56,16 +60,24 @@
           <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), [:edit, resource], :title => t("action.update") + " #{@model.display_name}" %>
         </h5>
       </div>
-      <div class="widget-body row-fluid">
-        <div id="gallery-container" class="js-masonry"
-        data-masonry-options='{ "columnWidth": 3, "itemSelector": ".gallery-item" }'>
-        <% resource.send(@model.get_image_relationship).each do |image|%>
-        <div class="gallery-item">
-          <%= link_to (image_tag image.file_url(:thumb)), image.file.to_s, :rel  => "group", :name => @model.display_name %>
-          <%#= link_to (image_tag image.file_url(:thumb)), image.file.to_s, :rel  => "group", :name => @model.display_name %>
+      <% if @model.act_as_a_gallery?.nil? %>
+        <div class="widget-body row-fluid">
+          <div id="gallery-container" class="js-masonry"
+          data-masonry-options='{ "columnWidth": 3, "itemSelector": ".gallery-item" }'>
+          <% resource.send(@model.get_image_relationship).each do |image|%>
+            <div class="gallery-item">
+              <%= link_to (image_tag image.file_url(:thumb)), image.file_url(:thumb).to_s, :rel  => "group", :name => @model.display_name %>
+            </div>
+          <% end %>
+          </div>
         </div>
-        <% end %>
+      <% else %>
+      <div class="widget-body widget-tasks-assigned clearfix">
+        <ul id="gallery-entries">
+          <%= render 'shared/gallery_entries', :images => resource.send(@model.get_image_relationship) %>
+        </ul>
       </div>
+      <% end %>
     </div>
   </div>
   <% end %>

data/config/routes.rb

@@ -2,34 +2,40 @@ include Adminpanel::RouterHelper
 
 Adminpanel::Engine.routes.draw do
 
-  adminpanel_resources.each do |file|
-    if file
-      resources file.to_sym
-    end
-  end
-
-	resources :sections, :except => [:new, :create, :destroy]
-    match '/signout', :to => 'sessions#destroy', :via => :delete, :as => "signout"
-    match '/signin', :to => 'sessions#new', :as => "signin"
-    resources :users
-    if !Adminpanel.unincluded_modules.include?(:categories)
-      resources :categories
-    end
-
-    if !Adminpanel.unincluded_modules.include?(:gallery)
+  Adminpanel.displayable_resources.each do |resource|
+    case resource
+    when :sections
+      resources :sections, :except => [:new, :create, :destroy]
+    when :users
+      resources :users
+    when :galleries
       resources :galleries do
         member do
           put :move_better, :as => "move_to_better"
           put :move_worst, :as => "move_to_worst"
         end
       end
-    end
-    resources :sessions, :only => [:new, :create, :destroy]
-
-    if !Adminpanel.unincluded_modules.include?(:analytics)
-      resources :pages, :path => 'analytics', :only => [:index]
-      root :to => 'pages#index'
+    when :categories
+      resources :categories
+    when :analytics
+      resources :analytics, :only => [:index]
     else
-      root :to => 'users#index'
+      if !acts_as_a_gallery?(resource).nil?
+        resources resource
+        resources acts_as_a_gallery?(resource).to_sym, :only => [:index] do
+          member do
+            put :move_better, :as => 'move_to_better'
+            put :move_worst, :as => 'move_to_worst'
+          end
+        end
+      else
+        resources resource
+      end
     end
+  end
+
+  root :to => "#{Adminpanel.displayable_resources.first}#index"
+  resources :sessions, :only => [:new, :create, :destroy]
+  match '/signout', :to => 'sessions#destroy', :via => :delete, :as => "signout"
+  match '/signin', :to => 'sessions#new', :as => "signin"
 end

data/lib/adminpanel/active_record/adminpanel_extension.rb

@@ -2,18 +2,51 @@ module ActiveRecord
   module AdminpanelExtension
     extend ActiveSupport::Concern
     #instance methods
-    # def foo
+    def move_to_better_position
+      if self.position > 1
+        conflicting_gallery = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).find_by_position(position - 1)
+        self.update_attribute(:position, self.position - 1)
+        conflicting_gallery.update_attribute(
+          :position, conflicting_gallery.position + 1
+          )
+        true
+      else
+        false
+      end
+    end
 
-    # end
+    def move_to_worst_position
+      records = self.class.count
+      if self.position < records
+        conflicting_gallery = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).find_by_position(position + 1)
+        update_attribute(:position, self.position + 1)
+        conflicting_gallery.update_attribute(
+          :position, conflicting_gallery.position - 1
+          )
+        true
+      else
+        false
+      end
+    end
 
     # static(class) methods
     module ClassMethods
-
       def mount_images(relation)
         has_many relation, :dependent => :destroy
 		    accepts_nested_attributes_for relation, :allow_destroy => true
       end
 
+      def act_as_a_gallery
+        before_create :set_position
+        before_destroy :rearrange_positions
+
+        default_scope { order("position ASC")}
+      end
+
+      # def self.of_parent(field, id)
+      #   where(field.to_sym => id)
+      # end
+
       def form_attributes
         [{
           "name" => {
@@ -122,9 +155,35 @@ module ActiveRecord
       def icon
         "icon-truck"
       end
+
+      def act_as_a_gallery?
+        nil
+      end
+
+      def self.relation_field
+        'undefined_relation_field'
+      end
     end
-  end
 
+  private
+    def rearrange_positions
+      unarranged_galleries = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).where("position > ?", self.position)
+      unarranged_galleries.each do |gallery|
+        gallery.update_attribute(:position, gallery.position - 1)
+      end
+
+    end
+
+    def set_position
+      last_record = self.class.where(self.class.relation_field => self.send(self.class.relation_field)).last
+      if last_record.nil?
+        self.position = 1
+      else
+        self.position = last_record.position + 1
+      end
+    end
+
+  end
   # include the extension
   ActiveRecord::Base.send(:include, AdminpanelExtension)
 end

data/lib/adminpanel/engine.rb

@@ -5,11 +5,16 @@ module Adminpanel
 
   class << self
   	mattr_accessor :analytics_profile_id, :analytics_key_path, :analytics_key_filename,
-    :unincluded_modules
+    :displayable_resources
   	self.analytics_profile_id = nil
   	self.analytics_key_path = "config/analytics"
   	self.analytics_key_filename = nil
-    self.unincluded_modules = []
+    self.displayable_resources = [
+      :analytics,
+      :users,
+      :galleries,
+      :sections
+    ]
   end
 
   def self.setup(&block)

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -16,7 +16,7 @@ module Adminpanel
       end
 
       def create_uploader
-        template 'uploader.rb', "app/uploader/adminpanel/#{lower_name}_uploader.rb"
+        template 'uploader.rb', "app/uploaders/adminpanel/#{lower_name}_uploader.rb"
       end
 
       def create_migration

data/lib/generators/adminpanel/gallery/templates/gallery_template.rb

@@ -4,5 +4,11 @@ module Adminpanel
 
     mount_uploader :file, <%= class_name %>Uploader
 
+    # act_as_a_gallery
+
+    # def self.relation_field
+    #   'something_id'
+    # end
+
   end
 end

data/lib/generators/adminpanel/gallery/templates/uploader.rb

@@ -17,7 +17,7 @@ module Adminpanel
 
     # THE THUMB VERSION IS NECESSARY!!!!
     version :thumb do
-      process :resize_to_limit => [220, 220]
+      process :resize_to_limit => [80, 80]
     end
 
     # however, you can create your own versions:
@@ -70,7 +70,7 @@ module Adminpanel
     # resize_to_limit(width, height)
     #
     # Resize the image to fit within the specified dimensions while retaining
-    # the original aspect ratio. Will only resize the image if it is larger than 
+    # the original aspect ratio. Will only resize the image if it is larger than
     # the specified dimensions. The resulting image may be shorter or narrower
     # than specified in the smaller dimension but will not be larger than the
     # specified values.

data/lib/generators/adminpanel/initialize/initialize_generator.rb

@@ -5,10 +5,26 @@ module Adminpanel
 			desc "Generate the migrations necessary to start the gem"
   		source_root File.expand_path("../templates", __FILE__)
 			argument :name, :type => :string, :default => "default", :require => false
-			class_option :'skip-category', :type => :boolean, :aliases => "-c", :default => false, :desc => "Include category skeleton and migration for it"
-			class_option :'skip-uploader', :type => :boolean, :aliases => "-u", :default => false
-			class_option :'skip-migration', :type => :boolean, :aliases => "-m", :default => false
-			class_option :'skip-setup', :type => :boolean, :aliases => "-s", :default => false
+			class_option :'skip-category',
+				:type => :boolean,
+				:aliases => '-c',
+				:default => false,
+				:desc => "Skip category skeleton and migration for it if true"
+			class_option :'skip-section-uploader',
+				:type => :boolean,
+				:aliases => '-u',
+				:default => false,
+				:desc => 'Skip section uploader if true'
+			class_option :'skip-migration',
+				:type => :boolean,
+				:aliases => '-m',
+				:default => false,
+				:desc => 'Skip initial migrations if true'
+			class_option :'skip-setup',
+				:type => :boolean,
+				:aliases => '-p',
+				:default => false,
+				:desc => 'Skip setup if true'
 
 			def create_initializers
 				if !options[:'skip-setup']
@@ -25,12 +41,12 @@ module Adminpanel
 			end
 
 			def create_section_uploader
-				if !options[:'skip-uploader']
-					copy_file "section_uploader.rb", 'app/uploader/adminpanel/section_uploader.rb'
+				if !options[:'skip-section-uploader']
+					copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
 				end
 			end
 
-			def create_migration
+			def create_adminpanel_migration
 				if !options[:'skip-migration']
     			migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
 				end