adminpanel 1.2.5 → 1.2.6

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 before_install:
-  - gem update --system 2.1.11
   - gem --version
 rvm:
   - "1.8.7"

data/README.md

@@ -1,6 +1,6 @@
 # Adminpanel
 
-This gem is developed to be a CMS for Ruby 1.8.7 and Rails 3.2.12 
+This gem is developed to be a CMS for Ruby 1.8.7 and Rails 3.2.12
 
 [![Gem Version](https://badge.fury.io/rb/adminpanel.png)](http://badge.fury.io/rb/adminpanel@2x)
 [![Travis CI   ](https://api.travis-ci.org/joseramonc/adminpanel.png)       ](https://travis-ci.org/joseramonc/adminpanel)
@@ -17,11 +17,14 @@ And then execute:
 
 ## Usage
 
-In you application.rb 
+In you application.rb
+
+    config.default_locale = :es
 
-    config.i18n.default_locale = :es
 no other language is currently supported, but pull requests are welcome.
 
+The create a directory called `adminpanel` under `app/controllers` this is the directory where your admin resources will go.
+
 Then run:
 
     rails g adminpanel:initialize
@@ -48,13 +51,13 @@ Please make sure that you have (rmagick) ImageMagick -v 2.13.2 installed before
 ###Google Analytics Integration
 
 To take advantage of the Integration with the Google Analytics Service you should add the analytics script to the public side of your application and then create an intializer called when you setup your authentication with Google
-	
+
 	# The configuration values you can provide are
 
 	Adminpanel.setup do |config|
 		# You get this from the Google Analytics Dashboard, this configuration is required.
 		config.analytics_profile_id = '12341234'
-		# The next configuration is the file used to establish server to server authentication/authorization 
+		# The next configuration is the file used to establish server to server authentication/authorization
 		# you need to download this file from the Google Developers Console
 		# and place it inside your application, this configuration is required.
 		config.analytics_key_filename = '12345ABCDE.p12'
@@ -64,7 +67,7 @@ To take advantage of the Integration with the Google Analytics Service you shoul
 
 Currently it only shows the visits from the last week, but more integrations will come.
 
-For more information about using the Google API visit 
+For more information about using the Google API visit
 * [Google Analytics API](https://developers.google.com/analytics/devguides/reporting/core/v3/)
 * [Google API Ruby Client](https://github.com/google/google-api-ruby-client)
 * [Google OAuth 2.0](https://developers.google.com/accounts/docs/OAuth2)

data/Rakefile

@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-task :default => :spec
 RSpec::Core::RakeTask.new
+task :default => :spec

data/app/helpers/adminpanel/application_helper.rb

@@ -29,11 +29,11 @@ module Adminpanel
 			section_name.downcase == 'login'
 		end
 
-		def link_to_add_fields(name, f, association, model_name)
+		def link_to_add_fields(name, f, association)
 			new_object = f.object.send(association).klass.new
 			id = new_object.object_id
 			fields = f.fields_for(association, new_object, :child_index => id) do |builder|
-			  render("shared/" + association.to_s.singularize + "_fields", :f => builder, :model_name => model_name)
+			  render("shared/image_fields", :f => builder)
 			end
 			link_to(content_tag(:div, content_tag(:button,
 						content_tag(:h6, name, :id => "add-image-button"),

data/app/helpers/adminpanel/custom_form_builder.rb

@@ -3,7 +3,7 @@ module Adminpanel
 
 		alias_method :text_field_original, :text_field
 		alias_method :radio_button_original, :radio_button
-		alias_method :checkbox_original, :check_box
+		alias_method :parent_file_field, :file_field
 
 		def text_field(name, *args)
 			options = args.extract_options!
@@ -18,17 +18,53 @@ module Adminpanel
 			end
 		end
 
-		def adminpanel_file_field(name, *args)
+		def file_field(name, *args)
 			options = args.extract_options!
+			label = options['label']
+			options.delete('label')
 
-			options.reverse_merge! :class => "span7"
-			options.reverse_merge! :label => name
-			label = options[:label]
-			options.delete(:label)
 
-			@template.content_tag :div, :class => "control-group" do
+			image = @template.content_tag :div, :class => "control-group" do
 				@template.content_tag(:label, label, :class => "control-label") +
-				@template.content_tag(:div, file_field(name, *args << options), :class => "controls")
+				@template.content_tag(:div, super(name, *args << options), :class => "controls")
+			end
+
+			if object.new_record?
+				image
+			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
+			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 = parent_file_field(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.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
 		end
 
@@ -91,7 +127,7 @@ module Adminpanel
 			options = args.extract_options!
 
 			options.reverse_merge! :class => "span7"
-			# options.reverse_merge! :label => name
+
 			options.reverse_merge! :include_blank => "(Seleccione por favor)";
 			label = options[:label]
 			options.delete(:label)

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -2,9 +2,9 @@ module Adminpanel
 	module SharedPagesHelper
 		def parent_object_name(resource, parent_model)
 			@model.reflect_on_all_associations.each do |association|
-                if association.klass.to_s == parent_model 
+                if association.klass.to_s == parent_model
                 	if !resource.send(association.name).nil?
-                		return resource.send(association.name).name 
+                		return resource.send(association.name).name
                 	else
                 		return "N/A"
                 	end
@@ -28,6 +28,13 @@ module Adminpanel
 			class_name.to_s.demodulize.downcase
 		end
 
+		def active_tab(index)
+			if index == 0
+				return "active"
+			else
+				return ""
+			end
+		end
 
 	end
-end
+end

data/app/models/adminpanel/gallery.rb

@@ -40,6 +40,12 @@ module Adminpanel
 	  	end
 	  end
 
+		def self.form_attributes
+			[
+				{'file' => { 'name' => 'Archivo' }}
+			]
+		end
+
 		def self.display_name
 			"Galería"
 		end

data/app/models/adminpanel/image.rb

@@ -1,15 +1,10 @@
 module Adminpanel
 	class Image < ActiveRecord::Base
-		extend ClassDefinitionsHelper
 
-		attr_accessible :file, :foreign_key, :model
-		validates_presence_of :model
+		attr_accessible :file
+
 		validates_presence_of :file
 
-		if is_class?("CustomImageUploader")
-	  		mount_uploader :file, CustomImageUploader
-		else
-	  		mount_uploader :file, Adminpanel::ImageUploader
-		end
+		mount_uploader :file, Adminpanel::SectionUploader
 	end
 end

data/app/models/adminpanel/section.rb

@@ -2,15 +2,14 @@ require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 module Adminpanel
 	class Section < ActiveRecord::Base
-	  attr_accessible :description, :has_image, :key, :page, :name, :has_description, :images_attributes
+	  attr_accessible :description, :has_image, :key, :page, :name, :has_description,
+		:images_attributes, :file
 
-	  has_many :images, :foreign_key => "foreign_key", :conditions => { :model => "Section" }
-	  accepts_nested_attributes_for :images, :allow_destroy => true
+	  mount_images :images
 
-
-	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == "telephone"}
+	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == I18n.t('key.telephone')}
 	  validates_presence_of :description, :minimum => 9, :on => :update, :if => lambda{|section| section.has_description == true}
-	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == "telephone"}
+	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == I18n.t('key.telephone')}
 	  validates_presence_of :key
 	  validates_presence_of :name
 	  validates_presence_of :page
@@ -19,6 +18,17 @@ module Adminpanel
 
 	  scope :of_page, lambda{|page| where(:page => page)}
 
+		def self.form_methods
+			[
+				{'description' => {'name' => 'Descripcion'}},
+				{'name' => {'name' => 'name'}},
+				{'key' => {'name' => 'key'}},
+				{'page' => {'name' => 'page'}},
+				# {'key' => {'name' => 'key'}},
+			]
+
+		end
+
 	  def simple_name
 	  	"Section"
 	  end

data/app/uploaders/adminpanel/image_uploader.rb

@@ -28,7 +28,7 @@ module Adminpanel
     # end
 
     # Process files as they are uploaded:
-    process :resize_to_fill => [1366, 768]
+    # process :resize_to_fill => [1366, 768]
     #
     # def scale(width, height)
     #   # do something
@@ -55,4 +55,4 @@ module Adminpanel
     # end
 
   end
-end
+end

data/app/views/adminpanel/categories/_categories_table.html.erb

@@ -8,7 +8,7 @@
           :class => 'icon-plus-sign icon-2x') +
           content_tag(
             :span,
-            I18n.t("action.create") + " #{@model.display_name} de #{model}",
+            I18n.t("action.create") + " #{@model.display_name} para #{model}",
             nil
           ),
           :class => "btn btn-box span2"),

data/app/views/adminpanel/categories/index.html.erb

@@ -7,15 +7,16 @@
         <% current_page = "no-page" %>
         <% @categories.each_with_index do |category, index| %>
           <% if current_page != category.model %>
-          <% if index == 0 %>
-            <li class = "active">
-          <% else %>
-            <li>
-          <% end %>
-            <% if !category.model.nil? %>
-              <%= link_to (category.model.capitalize), "#tab#{index}", "data-toggle" => "tab" %></li>
+            <li class = "<%= active_tab(index) %>">
+              <%=
+              link_to(
+                (pluralize_es(category.model.capitalize)),
+                "#tab#{index}",
+                "data-toggle" => "tab"
+              )
+              %>
+            </li>
             <% current_page = category.model %>
-            <% end %>
           <% end %>
         <% end %>
       </ul>

data/app/views/adminpanel/galleries/edit.html.erb

@@ -1,5 +1,5 @@
 <% provide(:page_title, "Editar") %>
-<% breadcrumb_add(t("Gallery"), galleries_path) %>
+<% breadcrumb_add(t("model.Gallery"), galleries_path) %>
 <% breadcrumb_add('Imagen', gallery_path(@gallery)) %>
 <div class="row-fluid">
   <div class = "widget widget-padding span12">
@@ -8,14 +8,7 @@
       <div class = "widget-forms clearfix">
         <%= custom_form_for(@gallery, :url => gallery_path(@gallery), :html => {:class => "form-horizontal"}) do |f| %>
           <%= render 'shared/error_messages', :object => @gallery %>
-          <% if @gallery.file %>
-          	<div class="controls">
-          		<div class="control-group">
-          			<%= image_tag @gallery.file_url(:thumb) %>
-          		</div>
-          	</div>
-          <% end %>
-          <%= f.adminpanel_file_field :file, :label => "Imagen" -%>
+          <%= f.gallery_field :file %>
       </div>
     </div>
     <div class = "widget-footer">
@@ -23,4 +16,4 @@
     </div>
       <% end -%>
   </div>
-</div>
+</div>

data/app/views/adminpanel/galleries/index.html.erb

@@ -1,4 +1,4 @@
-<%= provide(:page_title, t("model.Adminpanel::Gallery")) %>
+<%= provide(:page_title, t("model.Gallery")) %>
 <div class="row-fluid">
   <%=
     link_to(
@@ -25,7 +25,7 @@
   <div class="widget widget-padding span12">
     <div class="widget-header">
           <i class="icon-picture"></i>
-          <h5><%= t("model.Adminpanel::Gallery") %></h5>
+          <h5><%= t("model.Gallery") %></h5>
         </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">

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

@@ -1,5 +1,5 @@
 <% provide(:page_title, t("gallery.new")) %>
-<% breadcrumb_add(t("model.Adminpanel::Gallery"), galleries_path) %>
+<% breadcrumb_add(t("model.Gallery"), galleries_path) %>
 <div class="row-fluid">
   <div class = "widget widget-padding span12">
     <div class = "widget-header"><i class = "icon-picture"></i><h5>Imagen</h5></div>
@@ -7,7 +7,7 @@
       <div class = "widget-forms clearfix">
         <%= custom_form_for(@gallery, :url => galleries_path, :html => {:class => "form-horizontal"}) do |f| %>
           <%= render 'shared/error_messages', :object => @gallery %>
-          <%= f.adminpanel_file_field :file, :label => "Imagen" -%>
+          <%= f.file_field :file, :label => "Imagen" -%>
       </div>
     </div>
     <div class = "widget-footer">
@@ -15,4 +15,4 @@
     </div>
       <% end -%>
   </div>
-</div>
+</div>

data/app/views/adminpanel/sections/edit.html.erb

@@ -10,27 +10,23 @@
           <%= render 'shared/error_messages', :object => @section %>
 
           <% if @section.has_description %>
-            <div class="control-group">
-              <label class="control-label"><%= t("model.attributes.Adminpanel::Section.description") %></label>
-              <div class="controls">
-                <%= f.hidden_field :description, :id => "description-field" %>
-                  <% if @section.description.nil? %>
-                    <%= content_tag(:div, @section.description, :class => "editable", "data-placeholder" => t("Write description here")) %>
-                  <% else %>
-                    <%= content_tag(:div, @section.description.html_safe, :class => "editable", "data-placeholder" => t("Write description here")) %>
-                  <% end %>
-              </div>
-            </div>
+            <%= f.hidden_field 'description', :id => "description-field", :value => @section.description %>
+            <%= f.wysiwyg_field 'description', 'label' => I18n.t('section.description'), :name => 'description' %>
+            <%= content_for :scripts do %>
+              <script type="text/javascript">
+              <%= render "shared/init_editor", :field_var => 'description', :label => 'description' %>
+              </script>
+            <% end %>
           <% else %>
-            <%= f.text_field :description, :label => t("model.attributes.Adminpanel::Section.description") %>
+            <%= f.text_field 'description', :label => t("section.description") %>
           <% end %>
 
           <% if @section.has_image %>
               <%= f.fields_for :images do |builder| %>
-                <%= render 'image_fields', :f => builder, :model_name => @section.simple_name %>
+                <%= render 'shared/image_fields', :f => builder %>
               <% end -%>
 
-              <%= link_to_add_fields "Agregar Imagen", f, :images, @section.simple_name %>
+              <%= link_to_add_fields "Agregar Imagen", f, :images %>
           <% end %>
       </div>
     </div>
@@ -39,4 +35,4 @@
     </div>
       <% end -%>
   </div>
-</div>
+</div>

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

@@ -3,7 +3,7 @@
 
 	<% if properties["type"] == "wysiwyg_field" %>
 		<% type = properties["type"] %>
-		<% args = properties.except("type", "name") %>
+		<% args = properties.except("type") %>
 		<%= f.hidden_field attribute, :id => "#{attribute}-field", :value => resource.send(attribute) %>
 		<%= f.send(type, attribute, args) %>
 		<%= content_for :scripts do %>
@@ -13,10 +13,10 @@
 		<% end %>
 
 	<% elsif properties["type"] == "adminpanel_file_field" %>
-		<%= f.fields_for :images do |builder| %>
-    	<%= render 'shared/image_fields', :f => builder, :model_name => @model.display_name.capitalize %>
+		<%= f.fields_for(attribute) do |builder| %>
+    	<%= render 'shared/image_fields', :f => builder %>
   	<% end -%>
-  	<%= link_to_add_fields t("Add Image"), f, :images, @model.display_name.capitalize %>
+  	<%= link_to_add_fields t("Add Image"), f, attribute %>
 
   <% elsif properties["type"] == "belongs_to" %>
 		<% args = properties.except("type", "name", "model") %>
@@ -24,11 +24,18 @@
   	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
 
   <% elsif properties["type"] == "has_many" %>
-		<%= I18n.t('other.choose', :model => pluralize_es(properties["model"].classify.constantize.display_name)) %>
-  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
-  	<% @collections["#{properties["model"]}"].each do |resource| %>
-  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
-		<% end %>
+		<%#= f.checkbox(collection, relationship) %>
+		<div class="control-group">
+			<div class="control-label">
+				<%= I18n.t('other.choose', :model => pluralize_es(properties["model"].classify.constantize.display_name)) %>
+			</div>
+	  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
+			<div class="controls">
+		  	<% @collections["#{properties["model"]}"].each do |resource| %>
+		  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
+				<% end %>
+			</div>
+		</div>
 
   <% else %>
 		<% type = properties["type"] %>