adminpanel 1.2.12 → 2.0.0

data/app/models/adminpanel/user.rb

@@ -1,6 +1,6 @@
 module Adminpanel
   class User < ActiveRecord::Base
-    attr_accessible :email, :name, :password, :password_confirmation, :group_id
+    include Adminpanel::Base
     has_secure_password
     belongs_to :group
 
@@ -85,13 +85,21 @@ module Adminpanel
 
     end
 
+    def User.new_remember_token
+      SecureRandom.urlsafe_base64
+    end
+
+    def User.digest(token)
+      Digest::SHA1.hexdigest(token.to_s)
+    end
+
     def self.icon
-      'icon-user'
+      'user'
     end
 
     private
       def create_remember_token
-        self.remember_token = SecureRandom.base64.tr("+/", "-_")
+        self.remember_token = User.digest(User.new_remember_token)
       end
   end
 end

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

@@ -0,0 +1,149 @@
+module Adminpanel
+  module Base
+    extend ActiveSupport::Concern
+    #instance methods
+    # static(class) methods
+    module ClassMethods
+
+      def mount_images(relation)
+        has_many relation, :dependent => :destroy
+        accepts_nested_attributes_for relation, :allow_destroy => true
+      end
+
+      def form_attributes
+        [{
+          'name' => {
+            'type' => 'text_field',
+            'label' => 'name'
+          }
+        }]
+      end
+
+      def display_name
+        'please overwrite self.display_name'
+      end
+
+      def get_attribute_label(field)
+        form_attributes.each do |attribute|
+          attribute.each do |name, properties|
+            if name == field
+              return properties["label"]
+            end
+          end
+        end
+        return "field #{field} 'label' property not found :("
+      end
+
+      def get_attribute_placeholder(field)
+        form_attributes.each do |attribute|
+          attribute.each do |name, properties|
+            if name == field
+              return properties['placeholder']
+            end
+          end
+        end
+        return "field #{field} 'placeholder' property not found :("
+      end
+
+      def display_attributes(type)
+        display_attributes = []
+        form_attributes.each do |attribute|
+          attribute.each do |name, properties|
+            if properties['show'].nil? ||
+              properties['show'] == 'true' ||
+              properties['show'] == type
+              display_attributes << attribute
+            end
+          end
+        end
+
+        return display_attributes
+      end
+
+      def has_images?
+        form_attributes.each do |fields|
+        fields.each do |attribute, properties|
+          if properties['type'] == 'adminpanel_file_field'
+            return true
+          end
+        end
+        end
+        return false
+      end
+
+      def get_image_relationship
+        form_attributes.each do |fields|
+        fields.each do |attribute, properties|
+          if properties['type'] == 'adminpanel_file_field'
+            return attribute
+          end
+        end
+        end
+        return false
+      end
+
+      def belongs_to_relationships
+        belongs_to_classes = []
+        form_attributes.each do |fields|
+        fields.each do |attribute, properties|
+          if properties['type'] == 'belongs_to'
+            belongs_to_classes << properties['model'].classify.constantize
+          end
+        end
+        end
+        return belongs_to_classes
+      end
+
+      def has_many_relationships
+        has_many_classes = []
+        form_attributes.each do |fields|
+        fields.each do |attribute, properties|
+          if properties['type'] == 'has_many'
+            has_many_classes << properties['model'].classify.constantize
+          end
+        end
+        end
+        return has_many_classes
+      end
+
+      def icon
+        'truck'
+      end
+
+      def gallery_children
+        nil
+      end
+
+      def routes_options
+        { path: display_name.pluralize(I18n.default_locale).downcase }
+      end
+
+      def has_route?(route)
+        if (!exlude?(route)) && include_route(route)
+          true
+        else
+          false
+        end
+      end
+
+    private
+      def exlude?(route)
+        if routes_options[:except].nil?
+          false
+        elsif routes_options[:except].include?(route)
+          true
+        else
+          false
+        end
+      end
+
+      def include_route(route)
+        if routes_options[:only].nil? || routes_options[:only].include?(route)
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+module Adminpanel
+  module Galleryzation
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_position
+      before_destroy :rearrange_positions
+      default_scope { order("position ASC")}
+    end
+
+    def move_to_better_position
+      if self.position > 1
+        conflicting_gallery = get_conflicting_gallery(position - 1)
+
+        self.update_attribute(:position, self.position - 1)
+
+        conflicting_gallery.update_attribute(
+          :position, conflicting_gallery.position + 1
+        )
+        true
+      else
+        false
+      end
+    end
+
+    def move_to_worst_position
+      records = self.class.count
+      if self.position < records
+        conflicting_gallery = get_conflicting_gallery(position + 1)
+
+        update_attribute(:position, self.position + 1)
+
+        conflicting_gallery.update_attribute(
+          :position, conflicting_gallery.position - 1
+          )
+        true
+      else
+        false
+      end
+    end
+
+  private
+    def get_conflicting_gallery(conflicting_position)
+      self.class.where(
+        self.class.relation_field => self.send(self.class.relation_field)
+      ).find_by_position(conflicting_position)
+    end
+
+    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
+end

data/app/models/contact.rb

@@ -2,22 +2,29 @@ class Contact
   include ActiveModel::Validations
   include ActiveModel::Conversion
   extend ActiveModel::Naming
-  
+
   attr_accessor :name, :email, :subject, :body
-  
-  validates_presence_of :name
-  validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
-  validates_presence_of :email
-  validates_presence_of :subject
-  validates_presence_of :body
+
+  validates_presence_of :name, message: "#{I18n.t('model.attributes.name')} #{I18n.t('activerecord.errors.messages.blank')}"
+  VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+  validates_format_of :email, :with => VALID_EMAIL_REGEX, message: "#{I18n.t('model.attributes.email')} #{I18n.t('activerecord.errors.messages.invalid')}"
+  validates_presence_of :body, message: "#{I18n.t('model.attributes.body')} #{I18n.t('activerecord.errors.messages.blank')}"
 
   def initialize(attributes = {})
     attributes.each do |name, value|
       send("#{name}=", value)
     end
   end
-  
+
+  def self.display_name
+    'Correo'
+  end
+
+  def self.get_attribute_label(label)
+    return label
+  end
+
   def persisted?
     false
   end
-end
+end

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

@@ -1,10 +1,11 @@
+<% provide(:page_title, "Google Analytics") -%>
 <% content_for :scripts do %>
 	<%#= javascript_include_tag "adminpanel/analytics/analytics" %>
 <% end %>
 <div class="row-fluid">
 	<div class="widget widget-padding span12">
 		<div class="widget-header">
-			<i class="icon-bar-chart"></i><h5>Estadísticas del Sitio</h5>
+			<i class="fa fa-dashboard"></i><h5>Estadísticas del Sitio</h5>
 		</div>
 		<%= content_tag "div", :id => "graphic-container", :class => "widget-body", :data => { :visits => @visits, :dates => @visitDates } do %>
 		<% end %>

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

@@ -5,7 +5,7 @@
         content_tag(
           :i,
           nil,
-          :class => 'icon-plus-sign icon-2x') +
+          :class => 'fa fa-plus-circle fa-2x') +
           content_tag(
             :span,
             I18n.t("action.create") + " #{@model.display_name} para #{model}",
@@ -36,12 +36,11 @@
     <tr>
       <td><%= link_to category.name, category_path(category) %></td>
       <td>
-        <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_category_path(category), :title => "Editar" %>
-        <%= link_to content_tag(:i, nil, :class => 'icon-remove'),
-          [category],
-          :title => "Editar",
-          :method => :delete,
-          :data => { :confirm => "Eliminar #{category.name}?"} %>
+        <%= render 'shared/show_icon_button', resource: category %>
+
+        <%= render 'shared/edit_icon_button', resource: category %>
+
+        <%= render 'shared/delete_icon_button', resource: category %>
       </td>
     </tr>
   <% end %>

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

@@ -1,4 +1,4 @@
-<%= custom_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :currentcontroller => params[:currentcontroller]}, :remote => true, :html => {:class => "form-horizontal", :id => "new-category-form"}) do |f| -%>
+<%= custom_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :currentcontroller => params[:currentcontroller], :belongs_request => params[:belongs_request]}, :remote => true, :html => {:class => "form-horizontal", :id => "new-category-form"}) do |f| -%>
   <div class="row-fluid">
     <div class="modal-body">
         <%= render 'shared/error_messages', :object => resource %>
@@ -8,6 +8,6 @@
   </div>
   <div class="modal-footer">
     <button id="modal-button" class="btn" data-dismiss="modal" aria-hidden="true"><%= I18n.t('action.close') %></button>
-    <%= f.submit t("action.add") + " " + @model.display_name, :disable_with => t("action.submitting"), :id =>"new-#{@model.name.demodulize}-button" %>
+    <%= f.submit t("action.add") + " " + @model.display_name, data:{:disable_with => t("action.submitting")}, :id =>"new-#{@model.name.demodulize}-button" %>
   </div>
 <% end -%>

data/app/views/adminpanel/categories/create.js.erb

@@ -1,7 +1,7 @@
 // $("#modal-button").trigger("click");
 $('#new-category').modal('toggle');
 row = "<tr><td><%= escape_javascript link_to resource.name, category_path(resource) %></td>";
-row = row + "<td><%= escape_javascript link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_category_path(category), :title => 'Editar' %> ";
-row = row + "<%= escape_javascript link_to content_tag(:i, nil, :class => 'icon-remove'),[category], :title => 'Editar', :method => :delete %></td>";
+row = row + "<td><%= escape_javascript link_to content_tag(:i, nil, :class => 'fa fa-pencil'), edit_category_path(category), :title => 'Editar' %> ";
+row = row + "<%= escape_javascript link_to content_tag(:i, nil, :class => 'fa fa-remove'),[category], :title => 'Editar', :method => :delete %></td>";
 row = row + "</tr>";
 $("#<%= resource.model %>-table").append(row);

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

@@ -10,7 +10,7 @@
             <li class = "<%= active_tab(index) %>">
               <%=
               link_to(
-                (pluralize_es(category.model.capitalize)),
+                (category.model.capitalize.pluralize(I18n.default_locale)),
                 "#tab#{index}",
                 "data-toggle" => "tab"
               )

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

@@ -2,14 +2,14 @@
 	<tr>
 		<td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
 		<td>
-			<%= link_to content_tag(:i, nil, :class => "icon-chevron-up"), move_to_better_gallery_path(gallery), :method => :put, :remote => true %>
-			<%= link_to content_tag(:i, nil, :class => "icon-chevron-down"), move_to_worst_gallery_path(gallery), :method => :put, :remote => true %>
+			<%= link_to content_tag(:i, nil, :class => "fa fa-chevron-up"), move_to_better_gallery_path(gallery), :method => :put, :remote => true %>
+			<%= link_to content_tag(:i, nil, :class => "fa fa-chevron-down"), move_to_worst_gallery_path(gallery), :method => :put, :remote => true %>
 		</td>
 		<td>
-			<%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_gallery_path(gallery), :title => t("action.update") %>
-			<%= link_to content_tag(:i, nil, :class => 'icon-remove'), gallery_path(gallery), :title => t("action.delete"), :method => :delete,
-													:data => { :confirm => t("action.delete confirmation") }
-			%>
+			<%= render 'shared/show_icon_button', resource: gallery %>
+			<%= render 'shared/edit_icon_button', resource: gallery %>
+
+			<%= render 'shared/delete_icon_button', resource: gallery %>
 		</td>
 	</tr>
-<% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<%= provide(:page_title, t("model.Gallery")) %>
+<%= provide(:page_title, @model.display_name.pluralize(I18n.default_locale)) %>
 <div class="row-fluid">
   <%=
     link_to(
@@ -7,7 +7,7 @@
         content_tag(
           :i,
           nil,
-          :class => 'icon-plus-sign icon-2x'
+          :class => 'fa fa-plus-circle fa-2x'
         ) +
         content_tag(
           :span,
@@ -16,7 +16,8 @@
         ),
         :class => "btn btn-box span2"
       ),
-      new_gallery_path
+      new_gallery_path,
+      data: { no_turbolink: true }
     )
   %>
 </div>
@@ -24,8 +25,8 @@
 <div class="row-fluid">
   <div class="widget widget-padding span12">
     <div class="widget-header">
-          <i class="icon-picture"></i>
-          <h5><%= t("model.Gallery") %></h5>
+          <%= content_tag :i, nil, class: "fa fa-#{@model.icon}" %>
+          <h5><%= @model.display_name.pluralize(I18n.default_locale) %></h5>
         </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">

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

@@ -9,9 +9,9 @@
           <td><%= link_to section.name, section_path(section) %></td>
           <td><%= strip_tags section.description %></td>
           <td>
-            <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_section_path(section), :title => "Editar" %>
+            <%= render 'shared/edit_icon_button', resource: section, resource_name: @model.display_name %>
           </td>
         </tr>
 	<% end %>
 
-</table>
+</table>

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

@@ -3,14 +3,16 @@
 <% breadcrumb_add(@section.name, section_path(@section)) %>
 <div class="row-fluid">
   <div class = "widget widget-padding span12">
-    <div class = "widget-header"><i class = "icon-tasks"></i><h5><%= @section.name %></h5></div>
+    <div class = "widget-header"><i class = "fa fa-tasks"></i><h5><%= @section.name %></h5></div>
     <div class = "widget-body">
       <div class = "widget-forms clearfix">
         <%= custom_form_for(@section, :url => section_path(@section)) do |f| %>
           <%= render 'shared/error_messages', :object => @section %>
 
           <% if @section.has_description %>
-            <%= f.hidden_field 'description', :id => "description-field", :value => @section.description %>
+            <div style="display:none;">
+              <%= f.hidden_field 'description', :id => "description-field", :value => @section.description %>
+            </div>
             <%= f.wysiwyg_field 'description', 'label' => I18n.t('section.description'), :name => 'description' %>
             <%= content_for :scripts do %>
               <script type="text/javascript">
@@ -33,7 +35,7 @@
       </div>
     </div>
     <div class = "widget-footer">
-      <%= f.submit t("action.save"), :disable_with => t("action.submitting"), :id => "save-button" %>
+      <%= f.submit t("action.save"), data: {:disable_with => t("action.submitting")}, :id => "save-button" %>
     </div>
       <% end -%>
   </div>