adminpanel 2.6.1 → 3.0.0

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

@@ -14,25 +14,25 @@ module Adminpanel
         true
       end
 
-      def in_better_position(current_position, new_position, relation_id)
+      def in_better_position(current_position, new_position, record_id)
         where(
           'position >= ? AND position < ?',
           new_position,
           current_position
         ).where(
-          relation_field => relation_id
-          # => 'product_id' => member.product_id
+          model_id: record_id,
+          type: self.to_s
         )
       end
 
-      def in_worst_position(current_position, new_position, relation_id)
+      def in_worst_position(current_position, new_position, record_id)
         where(
           'position > ? AND position <= ?',
           current_position,
           new_position
         ).where(
-          relation_field => relation_id
-          # => 'product_id' => member.product_id
+          model_id: record_id,
+          type: self.to_s
         )
       end
     end
@@ -43,14 +43,14 @@ module Adminpanel
         self.class.in_better_position(
           self.position,
           new_position,
-          self.send(self.class.relation_field)
+          self.model_id
         ).update_all('position = position + 1')
       else
         # search for worster elements and upgrade them
         self.class.in_worst_position(
           self.position,
           new_position,
-          self.send(self.class.relation_field)
+          self.model_id
         ).update_all('position = position - 1')
       end
       self.update(position: new_position)
@@ -65,21 +65,16 @@ module Adminpanel
 
     def rearrange_positions
       self.class.where(
-        self.class.relation_field => self.send(
-          self.class.relation_field
-        )
-      ).where(
         'position > ?',
         self.position
+      ).where(
+        model_id: self.model_id,
+        model_type: self.model_type
       ).update_all('position = position - 1')
     end
 
     def set_position
-      last_record = self.class.where(
-        self.class.relation_field => self.send(
-          self.class.relation_field
-        )
-      ).ordered.last
+      last_record = self.class.ordered.last
       if last_record.nil?
         self.position = 1
       else

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

@@ -4,7 +4,7 @@
   <%= link_to google_analytics_path, class: 'spinner-link' do %>
     <i class="fa fa-google"></i>
   <% end %>
-  <%= link_to fb_analytics_path, class: 'spinner-link' do %>
+  <%= link_to fb_insights(@fb_auth), target: '_blank' do %>
     <i class="fa fa-facebook"></i>
   <% end %>
   <%= link_to twitter_analytics_path, class: 'spinner-link' do %>

data/app/views/adminpanel/form/_adminpanel_file_field.html.erb

@@ -1,24 +1,28 @@
-<% if !is_modal %>
-  <!-- if not making resource from other form -->
-  <%= content_tag(
-    :div,
-    class: 'file-collection-container',
-      data: {
-        max: properties['max-files'].nil? ? 0 : properties['max-files']
-      }
-  ) do %>
-    <%= f.fields_for(attribute) do |builder| %>
-      <%= render 'adminpanel/shared/image_fields', f: builder %>
-    <% end -%>
+<div class="zone-container">
+  <div class="zone-label">
+    <%= properties['label'] %>
+  </div>
 
-    <% if (
-      properties['max-files'].to_i != 0 &&
-      properties['max-files'].to_i <= f.object.send(@model.gallery_relationship).count.to_i
-    ) %>
-      <% hidden = 'hidden' %>
-    <% else %>
-      <% hidden = 'not-hidden' %>
-    <% end %>
-    <%= link_to_add_fields I18n.t('Add Image'), f, attribute, hidden %>
-  <% end %>
-<% end %>
+  <div class="controls">
+    <div class="zone">
+      <div id='<%= "#{attribute.singularize}_dropzone" %>' data-max-files="<%= properties['max_files'] %>">
+        <i class="fa fa-cloud-upload"></i>
+        <div><%= I18n.t('dropzone.drag_here') %></div>
+        <span><%= I18n.t('dropzone.or') %></span>
+        <div class="selectFile">
+          <a href="#" class="btn"><%= I18n.t('dropzone.choose_files') %></a>
+        </div>
+        <p><%= I18n.t('dropzone.size_limit', file_size: '10 MB') %></p>
+        <% f.object.send(attribute).each do |attrib| %>
+          <%= hidden_field_tag "#{f.object.class.to_controller_name.singularize}[#{attribute.singularize}_ids][]",
+                attrib.id,
+                data: {
+                  file_url: attrib.file_url(:thumb),
+                  file_size: attrib.file_size,
+                  file_name: attrib.file_identifier
+                } %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/adminpanel/icons/_delete.html.erb

@@ -10,6 +10,7 @@
       title: I18n.t('action.delete', resource: resource.name),
       id: 'resource-delete',
       method: :delete,
+      remote: true,
       data: {
         confirm: I18n.t('action.delete_confirmation', resource: resource.name)
       }

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

@@ -18,18 +18,7 @@
         <% end %>
 
         <% if @section.has_image %>
-          <%= content_tag :div, class: 'file-collection-container', data: { max: @section.max_files } do %>
-            <%= f.fields_for :sectionfiles do |builder| %>
-              <%= render 'adminpanel/shared/image_fields', f: builder %>
-            <% end -%>
-
-            <% if @section.max_files != 0 && @section.max_files <= @section.sectionfiles.count %>
-              <% visibility = 'hidden' %>
-            <% else %>
-              <% visibility = 'not-hidden' %>
-            <% end %>
-              <%= link_to_add_fields 'Agregar Imagen', f, :sectionfiles, visibility %>
-          <% end %>
+          <%= render 'adminpanel/form/adminpanel_file_field', properties: { label: 'Imágenes', max_files: @section.max_files }, f: f, attribute: 'sectionfiles' %>
         <% end %>
       <% end %>
       <%= f.footer do %>

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

@@ -5,6 +5,7 @@
 
     <% properties = properties.except('type') %>
     <% if is_customized_field?(field_type) %><!-- SharedPagesHelper -->
+      <!-- Fields needing complex markups -->
       <%= render(
           "adminpanel/form/#{field_type}",
           f: f,

data/app/views/adminpanel/templates/destroy.js.erb

@@ -0,0 +1,3 @@
+$row = $('tr[data-id="<%= @resource_instance.id -%>"]');
+$row.fadeOut();
+Turbolinks.cacheCurrentPage();

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

@@ -27,7 +27,7 @@
             </tr>
           </thead><!-- Ends model attributes -->
 
-          <tbody id="<%= table_type(@model) %>">
+          <tbody id="<%= table_type(@model) %>" data-no-transition-cache>
             <% @collection = @collection.ordered if table_type(@model) == 'sortable' %>
             <% @collection.each do |member| %>
               <% cache ["#{member.class}-member", member] do %>
@@ -44,9 +44,9 @@
                   <% end %>
                   <% @model.display_attributes('index').each do |fields| %>
                     <% fields.each do |attribute, properties| %>
-                    <td>
-                      <%= field_value(properties, attribute, member) %>
-                    </td>
+                      <td>
+                        <%= field_value(properties['type'], attribute, member) %><!-- SharedPagesHelper -->
+                      </td>
                     <% end %>
                   <% end %>
                   <td>

data/app/views/adminpanel/templates/show.html.erb

@@ -8,7 +8,7 @@
 ) %>
 
 <div class="row-fluid">
-  <div class="widget span6">
+  <div class="widget span12">
     <div class="widget-header">
       <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
       <h5>
@@ -34,7 +34,7 @@
                   <h6><%= properties['label'] %></h6>
                 </div>
                 <div class="span8">
-                  <%= field_value(properties, attribute, @resource_instance) %>
+                  <%= field_value(properties['type'], attribute, @resource_instance) %>
                 </div>
               </li>
             <% end %>
@@ -43,57 +43,62 @@
       </div>
     </div>
   </div>
-
+</div>
+<div class="row-fluid">
   <% if @model.has_gallery? %>
-    <div class="widget widget-padding span6">
-      <div class="widget-header">
-        <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
-        <h5><%= I18n.t('gallery.container') %>: <%= @model.display_name.humanize %>
-          <%= render 'adminpanel/icons/edit', resource: @resource_instance %>
-        </h5>
-      </div>
-      <% if @model.has_sortable_gallery? %>
-        <div class="widget-body widget-tasks-assigned clearfix">
-          <table class="table table-striped table-bordered">
-            <thead>
-              <tr>
-                <td class="draggable-header"></td>
-                <td><i class="fa fa-picture-o"></i></td>
-              </tr>
-            </thead>
-            <tbody id="sortable">
-              <% collection = @resource_instance.send(@model.gallery_relationship).ordered %>
-              <% collection.each do |image| %>
-                <tr
-                  data-id="<%= image.id %>"
-                  data-url="<%= url_for [:move_to_position, image] %>"
-                >
-                  <td class="draggable img"><i class="fa fa-bars fa-2x"></i></td>
-                  <td>
-                    <%= link_to(
-                      image_tag(image.file_url(:thumb)),
-                      image.file.to_s,
-                      rel: "group",
-                      name: @model.display_name
-                    ) %>
-                  </td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
+    <% @model.galleries.each do |gallery| %>
+      <% gallery_class = gallery.last.constantize %>
+      <% gallery_relationship = gallery.first.pluralize %>
+      <div class="gallery-widget widget widget-padding span6">
+        <div class="widget-header">
+          <%= content_tag(:i, nil, class: "fa fa-#{@model.icon}") %>
+          <h5><%= I18n.t('gallery.container') %>: <%= @model.display_name.humanize %>
+            <%= render 'adminpanel/icons/edit', resource: @resource_instance %>
+          </h5>
         </div>
-      <% else %>
-        <div class="widget-body row-fluid">
-          <% @resource_instance.send(@model.gallery_relationship).each do |image| %>
-            <%= link_to(
-              image_tag( image.file_url(:thumb) ),
-              image.file_url.to_s,
-              rel: 'group',
-              name: @model.display_name
-            ) %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
+        <% if gallery_class.is_sortable? %>
+          <div class="widget-body widget-tasks-assigned clearfix">
+            <table class="table table-striped table-bordered">
+              <thead>
+                <tr>
+                  <td class="draggable-header"></td>
+                  <td><i class="fa fa-picture-o"></i></td>
+                </tr>
+              </thead>
+              <tbody id="sortable">
+                <% collection = @resource_instance.send(gallery_relationship).ordered %>
+                <% collection.each do |image| %>
+                  <tr
+                    data-id="<%= image.id %>"
+                    data-url="<%= url_for [:move_to_position, image] %>"
+                  >
+                    <td class="draggable img"><i class="fa fa-bars fa-2x"></i></td>
+                    <td>
+                      <%= link_to(
+                        image_tag(image.file_url(:thumb)),
+                        image.file.to_s,
+                        rel: "group",
+                        name: gallery_class.display_name
+                      ) %>
+                    </td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          </div>
+        <% else %>
+          <div class="widget-body row-fluid">
+            <% @resource_instance.send(gallery_relationship).each do |image| %>
+              <%= link_to(
+                image_tag( image.file_url(:thumb) ),
+                image.file_url.to_s,
+                rel: 'group',
+                name: @model.display_name
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
 </div>

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

@@ -10,11 +10,26 @@
       ) %>
     </div>
   <% end %>
-  <div class="accordion">
+  <div class="accordion" id="search-modules">
+
+    <div class="accordion-group" data-no-filter="true">
+      <div class="accordion-heading">
+        <%= text_field_tag :text,
+                            '',
+                            class: 'search-input',
+                            id: 'search-input',
+                            placeholder: I18n.t('search.placeholder'),
+                            autocomplete: :off,
+                            autofocus: true
+        %>
+      </div>
+    </div>
+
     <% Adminpanel.displayable_resources.each do |resource| %>
       <% resource_class = symbol_class(resource) %>
-      <% if can?(:read, resource_class) || can?( :publish, resource_class) %>
-        <div class="accordion-group">
+      <% if resource_class.has_route?(:index) && (can?(:read, resource_class) || can?( :publish, resource_class)) %>
+
+        <div class="accordion-group" data-filter="<%= resource_class.collection_name -%>">
           <div class="accordion-heading">
             <%= link_to(
               [route_symbol(resource.to_s)],

data/config/initializers/adminpanel/assets.rb

@@ -0,0 +1,4 @@
+Rails.application.config.assets.precompile += %w(
+  adminpanel/favicon.ico
+  adminpanel/codn.png
+)

data/config/locales/en.yml

@@ -1,6 +1,6 @@
 en:
   model:
-    Analytic: 'Google Analytics'
+    Analytic: 'Analytics'
     Categories: 'Categories'
     User: 'User'
     Role: 'Role'
@@ -41,7 +41,7 @@ en:
   Add Image: 'Add Image'
   wysiwyg:
     description: 'Write descrition here...'
-  Panel title: 'Panel Administrativo'
+  panel-title: 'Admin Panel'
   permission:
     0: 'Read'
     to_read: 'To see'
@@ -62,18 +62,20 @@ en:
   position: 'Position'
   action:
     add: 'Add %{resource}'
-    create: 'Create %{resource}'
+    cancel: Cancelar
     close: 'Close'
+    confirm: Confirmar
+    create: 'Create %{resource}'
+    delete_confirmation: "Are you sure you wan't to delete?"
+    delete: Delete
+    is_false: No
+    is_true: Yes
+    save_success: 'Has been saved successfully'
+    save: 'Save %{resource}'
     show: 'Show'
     submitting: 'Submitting...'
-    save: 'Save %{resource}'
-    save_success: 'Has been saved successfully'
     update: 'Update %{resource}'
-    delete: 'Delete'
     view: 'View'
-    delete_confirmation: "Are you sure you wan't to delete?"
-    is_true: 'Yes'
-    is_false: 'No'
   authentication:
     logout: 'Log out'
     login: 'Log in'
@@ -120,5 +122,18 @@ en:
     show: 'show'
     signout: 'signout'
     signin: 'signin'
+    add_to_gallery: 'add-to-galeria'
+    remove_image: 'delete-image'
   breadcrumb:
     index: 'Index'
+  dropzone:
+    drag_here: 'Drag here the files you wish to upload'
+    choose_files: 'Choose your files manually'
+    size_limit: 'File size limit: %{file_size}'
+    or: 'OR'
+    remove_file: 'Remove file'
+    cancel_upload: 'Cancela Upload'
+    cancel_upload_confirmation: 'Do you wish to cancel the upload?'
+    max_files_reached: 'You can not upload any more files'
+  search:
+    placeholder: Search

data/config/locales/es.yml

@@ -3,16 +3,14 @@ es:
     form:
       server_file: 'El archivo en el servidor es: %{file}'
   model:
-    Analytic: 'Google Analytics'
+    Analytic: 'Analytics'
     Role: 'Rol'
     User: 'Usuario'
     Permission: 'Permisos'
     Section: 'Sección'
     attributes:
-      adminproject_id: 'Proyecto'
       brief: 'Pequeña descripción'
       body: 'Contenido'
-      client_id: 'Cliente'
       description: 'Descripción'
       email: 'Correo electrónico'
       file: 'Imagen'
@@ -44,7 +42,7 @@ es:
   Add Image: 'Agregar Imagen'
   wysiwyg:
     description: 'Escriba la descripción aquí'
-  Panel title: 'Panel Administrativo'
+  panel-title: 'Panel Administrativo'
   permission:
     0: 'Ver'
     to_read: 'Ver'
@@ -65,7 +63,9 @@ es:
   position: 'Posición'
   action:
     add: 'Agregar %{resource}'
+    cancel: Cancelar
     close: 'Cerrar'
+    confirm: Confirmar
     create: 'Crear %{resource}'
     delete_confirmation: 'Estás seguro que desea eliminar %{resource}?'
     delete: 'Eliminar'
@@ -122,18 +122,16 @@ es:
     retweet: 'retweet'
     comment: 'comentar'
     publish: 'publicar-a-%{location}'
+    move_to_position: 'mover-posicion'
     facebook_page: 'pagina-en-facebook'
     new: 'nuevo'
     edit: 'editar'
     show: 'ver'
     signout: 'cerrar-sesion'
     signin: 'iniciar-sesion'
+    add_to_gallery: 'agregar-a-galeria'
+    remove_image: 'eliminar-image'
   analytics:
-    day: 'Hoy'
-    days_28: 'el mes'
-    now: 'Ahora'
-    week: 'Semana'
-    month: 'Mes'
     search: 'Buscar'
     impressions: 'Impresiones'
     unique: 'Únicas'
@@ -143,30 +141,6 @@ es:
     twitter: 'Estadísticas de Twitter'
     said: 'dijo'
     explanation: 'Explicación de las métricas'
-    description:
-      page_stories: '(Periodo) El número de historias creadas acerca de tu página (Cuenta total)'
-      page_consumptions: '(Periodo) El número de clicks en cualquiera de tus contenidos. Clicks generando historias están incluidos en otros clicks. Historias generadas sin clicks en la página (e.g., Darle like a la página en el `Timeline`) no son incluidos. (Cuenta total)'
-      page_consumptions_unique: '(Periodo) El número de clicks de usuarios diferentes en cualquiera de tus contenidos. Clicks generando historias están incluidos en otros clicks. Historias generadas sin clicks en la página (e.g., Darle like a la página en el `Timeline`) no son incluidos. (Usuarios únicos)'
-      page_views: '(Hoy) El total de vistas a la página (Cuenta total)'
-      page_views_unique: '(Hoy) El total de vistas a la página de usuarios loggeados en Facebook (Usuarios únicos)'
-      page_negative_feedback: '(Periodo) El número de veces que la gente te ha dado retroalimentación negativa (Unlike o Escoder página o post)(Cuenta total)'
-      page_negative_feedback_unique: '(Periodo) El número de personas que te ha dado retroalimentación negativa (Unlike o Escoder página o post)(Usuarios únicos)'
-      page_fans: '(Total) El número total de personas que ha dado like(me gusta) a la página (Usuarios únicos)'
-      page_fan_adds: '(Hoy) El número total de personas nuevas que le ha gustado tu página (Cuenta total)'
-      page_impressions_unique: '(Periodo) El número de personas que han visto cualquier contenido asociado con tu página (Usuarios únicos)'
-      page_impressions: '(Período) El número de impresiones vistas de cualquier contenido asociado con la página. (Cuenta Total)'
-    metrics:
-      page_stories: 'Hablando de esto'
-      page_consumptions: 'Clicks Totales'
-      page_consumptions_unique: 'Clicks de usuarios únicos'
-      page_views: 'Vistas a la página'
-      page_views_unique: 'Vistas de usuarios únicos a la página'
-      page_negative_feedback: 'Acciones negativas'
-      page_negative_feedback_unique: 'Acciones negativas de personas diferentes'
-      page_fans: 'Likes Totales'
-      page_fan_adds: 'Likes Nuevos'
-      page_impressions_unique: 'Impresiones de página de personas diferentes'
-      page_impressions: 'Impresiones de página'
   fb:
     posted: 'Publicado en el muro de %{user}'
     confirm_page: 'Seleccionar Cuenta'
@@ -183,3 +157,14 @@ es:
     saved_token: 'Log in con Twitter exitoso, ya puedes publicar con la cuenta de Twitter'
   breadcrumb:
     index: 'Inicio'
+  dropzone:
+    drag_here: 'Arrastre aqui los archivos que desea cargar'
+    choose_files: 'Elija sus archivos manualmente'
+    size_limit: 'Tamaño máximo de archivo: %{file_size}'
+    or: 'O'
+    remove_file: 'Eliminar'
+    cancel_upload: 'Cancelar'
+    cancel_upload_confirmation: 'Deseas cancelar la carga?'
+    max_files_reached: 'Ha cargado el número máximo de archivos admitidos por esta sección'
+  search:
+    placeholder: Buscar