adminpanel 2.0.0 → 2.0.1

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

@@ -1,4 +1,4 @@
-<%= custom_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :belongs_request => params[:belongs_request] }, :remote => true, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
+<%= adminpanel_form_for(resource, :url => {:action => :create, :model => params[:model], :model_name => params[:model_name], :belongs_request => params[:belongs_request] }, :remote => true, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
   <div class="row-fluid">
     <div class="modal-body">
         <%= render 'shared/error_messages', :object => resource %>

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

@@ -15,7 +15,7 @@
     </div>
     <div class = "widget-body">
       <div class = "widget-forms clearfix">
-        <%= custom_form_for(resource, :html => {:class => "form-horizontal", :id => "edit_resource"}) do |f| -%>
+        <%= adminpanel_form_for(resource, :html => {:class => "form-horizontal", :id => "edit_resource"}) do |f| -%>
           <%= render 'shared/error_messages', :object => resource %>
           <%= render 'shared/form_fields', :f => f %>
       </div>

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

@@ -16,10 +16,11 @@
     <div class = "widget-body">
       <div class = "widget-forms clearfix">
         <%=
-        custom_form_for(
-          resource, :html => {
-            :class => "form-horizontal",
-            :id => "new_resource"
+        adminpanel_form_for(
+          resource,
+          :html => {
+            :class => 'form-horizontal',
+            :id => 'new_resource'
           }
         ) do |f| -%>
           <%= render 'shared/error_messages', :object => resource %>
@@ -28,7 +29,7 @@
     </div>
     <div class = "widget-footer">
       <%=
-      f.submit t("action.add") + " " + @model.display_name,
+      f.submit t('action.add') + " " + @model.display_name,
         data: {:disable_with => t("action.submitting")},
         :id =>"new-#{@model.name.demodulize}-button"
       %>

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

@@ -25,14 +25,14 @@
                 <h6><%= properties["label"] %></h6>
               </div>
               <div class="span8">
-                <% if properties["type"] == "wysiwyg_field" %>
+                <% if properties['type'] == 'wysiwyg_field' %>
                   <%= resource.send(attribute).html_safe -%>
-                <% elsif properties["type"] == "belongs_to" %>
-                  <%= parent_object_name(resource, properties["model"]) %>
+                <% elsif properties['type'] == 'belongs_to' %>
+                  <%= parent_object_name(resource, properties['model']) %>
 
-                <% elsif properties["type"] == "has_many" %>
+                <% elsif properties['type'] == 'has_many' %>
                   <ul>
-                    <% resource.send("#{pluralize_model(properties["model"])}").each do |member| %>
+                    <% resource.send("#{pluralize_model(properties['model'])}").each do |member| %>
                       <li class="priority-low"><%= member.name %></li>
                     <% end %>
                   </ul>
@@ -57,8 +57,8 @@
     <% if @model.has_images? %>
     <div class="widget widget-padding span6">
       <div class="widget-header">
-        <%= content_tag(:i, nil, :class => @model.icon) %>
-        <h5><%= I18n.t("Gallery") %>: <%= @model.display_name.humanize %>
+        <%= content_tag(:i, nil, :class => "fa fa-#{@model.icon}") %>
+        <h5><%= I18n.t('gallery.container') %>: <%= @model.display_name.humanize %>
           <%= render 'shared/edit_icon_button', resource: resource, resource_name: @model.display_name %>
         </h5>
       </div>

data/config/locales/en.yml

@@ -1,6 +1,6 @@
 en:
   model:
-    Analytics: "Google Analytics"
+    Analytic: "Google Analytics"
     Gallery: "Gallery"
     Categories: "Categories"
     attributes:
@@ -20,7 +20,7 @@ en:
       username: "Nombre de usuario"
   errors:
     one: "%{model} can't be saved, 1 error"
-    other: "%{model} can't be saved, %{count} errors"
+    other: "%{model} can't be saved due %{count} errors"
   activerecord:
     errors:
       messages:
@@ -34,14 +34,12 @@ en:
         too_short: "too short, minimum is 6 characters"
   time:
     formats:
-      graphic: "%Y-%m-%d %H:%M:%S"
-      long: "%d/%m/%Y %l:%M:%S %p"
-      short: "%d de %B de %Y"
+      short: "%B %d, of %Y"
       estimate: "%Y-%m-%d"
   Add Image: "Add Image"
-  Write description here: "Write descrition here..."
-  Gallery: "Gallery"
-  Panel title: "Panel Administrativo CoDN"
+  wysiwyg:
+    description: "Write descrition here..."
+  Panel title: "Panel Administrativo"
   actions: "Actions"
   action:
     add: "Add"
@@ -87,3 +85,9 @@ en:
     add : "Add %{model}"
     choose: "Chooose related %{model}"
     no description: "Don't have a description yet"
+  routes:
+    new: 'new'
+    edit: 'edit'
+    show: 'show'
+    signout: 'signout'
+    signin: 'signin'

data/config/locales/es.yml

@@ -1,6 +1,6 @@
 es:
   model:
-    Analytics: "Google Analytics"
+    Analytic: 'Google Analítico'
     Gallery: "Galería de Inicio"
     Categories: "Categorías"
     attributes:
@@ -34,12 +34,11 @@ es:
         too_short: "es muy corta, mínimo 6 caracteres"
   time:
     formats:
-      graphic: "%Y-%m-%d %H:%M:%S"
-      long: "%d/%m/%Y %l:%M:%S %p"
       short: "%d de %B de %Y"
       estimate: "%Y-%m-%d"
   Add Image: "Agregar Imagen"
-  Write description here: "Escriba la descripción aquí"
+  wysiwyg:
+    description: "Escriba la descripción aquí"
   Panel title: "Panel Administrativo"
   actions: "Acciones"
   action:
@@ -62,10 +61,10 @@ es:
     signin_success: "Bienvenido!"
     not_authorized: 'No tienes permisos para acceder'
   gallery:
-    name: 'Galeria'
-    new: "Agregar Imagen"
-    success: "La imagen ha sido guardada"
-    deleted: "La imagen ha sido eliminada"
+    container: 'Imágenes'
+    new: 'Agregar Imagen'
+    success: 'La imagen ha sido guardada'
+    deleted: 'La imagen ha sido eliminada'
     moved : "Se ha actualizado la posición de la galería"
     not-moved: "No se pudo mover la Imagen"
     image: "Imagen"
@@ -85,5 +84,10 @@ es:
     email: "Correo electrónico"
   other:
     add : "Agregar %{model}"
-    choose: "Selecciona las relaciones con %{model}"
     no description: "No tiene descripción aún"
+  routes:
+    new: 'nuevo'
+    edit: 'editar'
+    show: 'ver'
+    signout: 'cerrar-sesion'
+    signin: 'iniciar-sesion'

data/config/routes.rb

@@ -6,35 +6,39 @@ Adminpanel::Engine.routes.draw do
     case resource
     when :sections
       # sections cannot be created or destroyed
-      resources :sections, resources_parameters(resource).merge({:except => [:new, :create, :destroy] })
+      resources :sections, resources_parameters(resource).merge(
+      { except: [:new, :create, :destroy] }.merge(rest_path_names)
+      )
     when :galleries
       # galleries gallery is different from normal resources galleries
-      resources :galleries, resources_parameters(resource) do
+      resources :galleries, resources_parameters(resource).merge(rest_path_names) do
         member do
-          put :move_better, :as => 'move_to_better'
-          put :move_worst, :as => 'move_to_worst'
+          put :move_better, as: 'move_to_better', path: 'subir-prioridad'
+          put :move_worst, as: 'move_to_worst', path: 'bajar-prioridad'
         end
       end
     when :analytics
-      resources :analytics, resources_parameters(resource).merge({:only => [:index]})
+      resources :analytics, resources_parameters(resource).merge(
+        { only: [:index] }.merge(rest_path_names)
+      )
     else
-      if !gallery_children(resource).nil?
+      if !get_gallery_children(resource).nil?
         # make the resources gallery routes
-        resources gallery_children(resource).to_sym, :only => [:index] do
+        resources get_gallery_children(resource).to_sym, only: [:index] do
           member do
-            put :move_better, :as => 'move_to_better'
-            put :move_worst, :as => 'move_to_worst'
+            put :move_better, as: 'move_to_better', path: 'subir-prioridad'
+            put :move_worst, as: 'move_to_worst', path: 'bajar-prioridad'
           end
         end
       end
 
       # normal resource
-      resources resource, resources_parameters(resource)
+      resources resource, resources_parameters(resource).merge(rest_path_names)
     end
   end
 
-  root :to => "#{Adminpanel.displayable_resources.first}#index"
-  resources :sessions, :only => [:new, :create, :destroy]
-  delete '/signout', :to => 'sessions#destroy', :as => "signout"
-  get '/signin', :to => 'sessions#new', :as => "signin"
+  root to: "#{Adminpanel.displayable_resources.first}#index"
+  resources :sessions, only: [:new, :create, :destroy]
+  delete '/signout', to: 'sessions#destroy', as: 'signout', path: I18n.t('routes.signout')
+  get '/signin', to: 'sessions#new', as: 'signin', path: I18n.t('routes.signin')
 end

data/lib/adminpanel.rb

@@ -4,7 +4,7 @@ require 'inherited_resources'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'google/api_client'
-require 'cancancan'
+require 'cancan'
 require 'font-awesome-rails'
 
 module Adminpanel

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/generators/adminpanel/initialize/templates/category_template.rb

@@ -1,6 +1,7 @@
 module Adminpanel
   class Category < ActiveRecord::Base
-
+    include Adminpanel::Base
+    
     validates_presence_of :model
     validates_presence_of :name
     validates_uniqueness_of :name

data/lib/tasks/adminpanel/adminpanel.rake

@@ -9,7 +9,7 @@ namespace :adminpanel do
       :name => args[:name].titleize,
       :has_description => false,
       :description => "",
-      :key => (args[:name].tr(' ','_')),
+      :key => (args[:name].downcase.tr(' ','_')),
       :page => args[:section],
       :has_image => false
     )

data/spec/features/shared_pages_spec.rb

@@ -122,7 +122,7 @@ describe 'Shared pages' do
 		it { page.should have_selector('div', :text => product.name) }
 		it { page.should have_selector('div', :text => product.price) }
 		it { page.should have_selector('div', :text => product.description) }
-		it { should have_content("#{I18n.t("Gallery")}: #{Adminpanel::Product.display_name}")}
+		it { should have_content("#{I18n.t("gallery.container")}: #{Adminpanel::Product.display_name}")}
 		it { should have_link('i', adminpanel.edit_product_path(product)) }
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,46 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -69,274 +69,274 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.7
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.7
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -374,9 +374,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -424,6 +424,9 @@ files:
 - app/assets/images/adminpanel/toolbar.png
 - app/assets/javascripts/adminpanel/bootstrap-datepicker.js
 - app/assets/javascripts/adminpanel/bootstrap-timepicker.js
+- app/assets/javascripts/adminpanel/bootstrap-wysihtml5-3.min.js
+- app/assets/javascripts/adminpanel/bootstrap-wysihtml5-advanced.js
+- app/assets/javascripts/adminpanel/bootstrap-wysihtml5.js
 - app/assets/javascripts/adminpanel/bootstrap.js
 - app/assets/javascripts/adminpanel/images_form.js
 - app/assets/javascripts/adminpanel/imagesloaded.js
@@ -434,9 +437,11 @@ files:
 - app/assets/javascripts/adminpanel/medium-editor.js
 - app/assets/javascripts/adminpanel/realm.js
 - app/assets/javascripts/adminpanel/tables.js
+- app/assets/javascripts/adminpanel/wysiwyg.js
 - app/assets/javascripts/application-admin.js
 - app/assets/stylesheets/adminpanel/_clearfix.css
 - app/assets/stylesheets/adminpanel/alertify.css
+- app/assets/stylesheets/adminpanel/bootstrap-wysihtml5.css
 - app/assets/stylesheets/adminpanel/bootstrap.css
 - app/assets/stylesheets/adminpanel/datepicker.css
 - app/assets/stylesheets/adminpanel/facybox.css
@@ -456,9 +461,9 @@ files:
 - app/controllers/adminpanel/users_controller.rb
 - app/controllers/concerns/adminpanel/galleryzable_actions.rb
 - app/controllers/concerns/adminpanel/rest_actions.rb
+- app/helpers/adminpanel/adminpanel_form_builder.rb
 - app/helpers/adminpanel/application_helper.rb
 - app/helpers/adminpanel/breadcrumbs_helper.rb
-- app/helpers/adminpanel/custom_form_builder.rb
 - app/helpers/adminpanel/router_helper.rb
 - app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/adminpanel/shared_pages_helper.rb
@@ -614,12 +619,12 @@ require_paths:
 - app/assets
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []