adminpanel 2.1.2 → 2.1.3

data/app/models/adminpanel/image.rb

@@ -1,9 +1,9 @@
 module Adminpanel
-	class Image < ActiveRecord::Base
-		include Adminpanel::Base
+  class Image < ActiveRecord::Base
+    include Adminpanel::Base
 
-		validates_presence_of :file
+    validates_presence_of :file
 
-		mount_uploader :file, Adminpanel::SectionUploader
-	end
+    mount_uploader :file, Adminpanel::SectionUploader
+  end
 end

data/app/models/adminpanel/section.rb

@@ -1,69 +1,77 @@
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 module Adminpanel
-	class Section < ActiveRecord::Base
-		include Adminpanel::Base
+  class Section < ActiveRecord::Base
+    include Adminpanel::Base
 
-	  mount_images :images
+    mount_images :images
 
-	  validates_length_of :description,
-				minimum: 10,
-				maximum: 10,
-				on: :update,
-				if: :is_a_phone?,
-				message: I18n.t('activerecord.errors.messages.not_phone')
-	  validates_presence_of :description,
-				minimum: 9,
-				on: :update,
-				if: lambda{|section| section.has_description == true }
-	  validates :description,
-				numericality: { only_integer: true },
-				on: :update,
-				if: :is_a_phone?
-	  validates_presence_of :key
-	  validates_presence_of :name
-	  validates_presence_of :page
+    validates_length_of :description,
+        minimum: 10,
+        maximum: 10,
+        on: :update,
+        if: :is_a_phone?,
+        message: I18n.t('activerecord.errors.messages.not_phone')
+    validates_presence_of :description,
+        minimum: 9,
+        on: :update,
+        if: :has_description
+    validates :description,
+        numericality: { only_integer: true },
+        on: :update,
+        if: :is_a_phone?
+    validates_presence_of :key
+    validates_presence_of :name
+    validates_presence_of :page
 
-		VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-		validates_format_of :description, with: VALID_EMAIL_REGEX, if: lambda{|section| section.key == 'email'}
+    VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+    validates_format_of :description, with: VALID_EMAIL_REGEX, if: :is_email?
 
-	  default_scope { order("page ASC") }
+    default_scope { order("page ASC") }
 
-	  scope :of_page, lambda{ |page|
-			where(page: page)
-		}
+    scope :of_page, lambda{ |page|
+      where(page: page)
+    }
 
-	  scope :with_description, -> { where.not( description: '') }
+    scope :with_description, -> { where.not( description: '') }
 
-		def self.form_attributes
-			[
-				{'description' => {'name' => 'Descripcion', 'description' => 'label', 'label' => 'Seccion'}},
-				{'name' => {'name' => 'name', 'label' => 'Seccion'}},
-				{'key' => {'name' => 'key', 'label' => 'Llave'}},
-				{'page' => {'name' => 'page'}},
-			]
+    def self.form_attributes
+      [
+        {'description' => {'name' => 'Descripcion', 'description' => 'label', 'label' => 'Seccion'}},
+        {'name' => {'name' => 'name', 'label' => 'Seccion'}},
+        {'key' => {'name' => 'key', 'label' => 'Llave'}},
+        {'page' => {'name' => 'page'}},
+      ]
 
-		end
+    end
 
-	  def self.icon
-	  	'tasks'
-	  end
+    def self.icon
+    	'tasks'
+    end
 
-		def self.display_name
-			'Seccion'
-		end
+    def self.display_name
+      'Seccion'
+    end
 
-		def description
-			if self.has_description && !self.attributes['description'].nil?
-				return self.attributes['description'].html_safe
-			else
-				return self.attributes['description']
-			end
-		end
+    def description
+      if self.has_description && !self.attributes['description'].nil?
+        return self.attributes['description'].html_safe
+      else
+        return self.attributes['description']
+      end
+    end
 
-		private
-		def is_a_phone?
-			key == 'phone' && description != ''
-		end
-	end
+    protected
+    def has_description?
+      !self.has_description.nil? || self.has_description
+    end
+
+    def is_email?
+      key == 'email' && description != ''
+    end
+
+    def is_a_phone?
+      key == 'phone' && description != ''
+    end
+  end
 end

data/app/models/adminpanel/user.rb

@@ -37,15 +37,13 @@ module Adminpanel
         {
           'name' => {
             'type' => 'text_field',
-            'name' => 'Nombre',
             'label' => 'Nombre',
             'placeholder' => 'Nombre'
             }
         },
         {
           'email' => {
-            'type' => 'text_field',
-            'name' => 'Correo',
+            'type' => 'email_field',
             'label' => 'Correo',
             'placeholder' => 'Correo'
           }
@@ -53,7 +51,6 @@ module Adminpanel
         {
           'password' => {
             'type' => 'password_field',
-            'name' => 'Contrasena',
             'label' => I18n.t('model.attributes.password'),
             'placeholder' => I18n.t('model.attributes.password'),
             'show' => 'false'
@@ -62,7 +59,6 @@ module Adminpanel
         {
           'password_confirmation' => {
             'type' => 'password_field',
-            'name' => 'Confirmacion de contrasena',
             'placeholder' => I18n.t('model.attributes.password_confirmation'),
             'label' => I18n.t('model.attributes.password_confirmation'),
             'show' => 'false'
@@ -71,7 +67,6 @@ module Adminpanel
         {
           'group_id' => {
             'type' => 'belongs_to',
-            'name' => 'Group',
             'model' => 'Adminpanel::Group',
             'remote_resource' => false,
             'placeholder' => I18n.t('model.attributes.group_id'),

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

@@ -13,7 +13,7 @@ module Adminpanel
     #   )
     # end
     def fb_link
-      'www.overwrite.fb_link.com'
+      'http://www.google.com'
     end
 
     # static(class) methods

data/app/uploaders/adminpanel/gallery_uploader.rb

@@ -53,4 +53,4 @@ module Adminpanel
     # end
 
   end
-end
+end

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

@@ -0,0 +1,63 @@
+<div class="widget-tasks-statistics">
+  <div class="userstats clearfix" style="margin-top: 25px;">
+    <%= link_to '#', data: { toggle: 'modal', target: "##{metric(inside)}" } do %>
+      <div class="white">
+        <i style="color:<%= color %>" class="fa fa-<%= icon %>"></i>
+        <p style="color:<%= color %>" >
+          <%= "#{first_fb_value(inside).to_i} #{placeholder}" %>
+        </p>
+      </div>
+      <div>
+        <input
+          class="knob"
+          data-width="120"
+          data-height="120"
+          data-displayInput=false
+          data-readOnly=true
+          data-thickness=".12"
+          value="<%= divide_metrics(inside, outside) * 100 %>"
+        >
+      </div>
+      <p>
+        <strong>
+          <%= first_fb_value(outside).to_i %>
+        </strong>
+        <%= label %>
+      </p>
+    <% end %>
+  </div>
+</div>
+
+<!-- modal -->
+<%= content_for :modals do %>
+<div id="<%= metric(inside) %>" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header" id="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="modal-title">
+      <%= I18n.t("analytics.metrics.#{metric(inside)}") %> /
+      <%= I18n.t("analytics.metrics.#{metric(outside)}") %>
+    </h3>
+  </div>
+  <div id="modal-container">
+    <div class="modal-body">
+      <ul>
+        <li>
+          <%= I18n.t("analytics.metrics.#{metric(inside)}") %>:
+          <%= I18n.t("analytics.description.#{metric(inside)}") %>
+        </li>
+        <br>
+        <li>
+          <%= I18n.t("analytics.metrics.#{metric(outside)}") %>:
+          <%= I18n.t("analytics.description.#{metric(outside)}") %>
+        </li>
+
+      </ul>
+    </div>
+    <div class="modal-footer">
+      <button id="modal-button" class="btn" data-dismiss="modal" aria-hidden="true">
+        <%= I18n.t('action.close') %>
+      </button>
+    </div>
+  </div>
+</div>
+<% end %>

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

@@ -0,0 +1,98 @@
+<% provide(:page_title, I18n.t('analytics.facebook')) -%>
+<%= form_tag fb_analytics_path, method: :get %>
+<%=
+  select_tag(
+    'insight',
+    options_for_select(
+      [
+        [I18n.t('analytics.now'), 'day'],
+        [I18n.t('analytics.week'), 'week'],
+        [I18n.t('analytics.month'), 'days_28']
+      ],
+      params[:insight]
+    )
+  )
+%>
+<%= button_tag(I18n.t('analytics.search'), type: 'submit', class: 'btn btn-info') %>
+<h3><%= I18n.t('analytics.for') %> <%= I18n.t("analytics.#{insight}") %></h3>
+<% date = Date.parse @new_likes.first['values'].first['end_time'] %>
+<h5><%= date - days_to_substract %> - <%= date %></h5>
+<div class="overview_boxes">
+  <div class="box_row clearfix">
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @new_likes,
+        outside: @total_likes,
+        placeholder: '+',
+        icon: 'thumbs-up',
+        color: '#98AEEA',
+        label: 'Likes'
+      )
+    %>
+
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @impressions_unique,
+        outside: @impressions,
+        placeholder: I18n.t('analytics.unique'),
+        icon: 'ticket',
+        color: '#6CD0F7',
+        label: I18n.t('analytics.impressions')
+      )
+    %>
+
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @views_unique,
+        outside: @views,
+        placeholder: 'únicas',
+        icon: 'eye',
+        color: '#6CD0F7',
+        label: 'Vistas'
+      )
+    %>
+
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @stories,
+        outside: @stories,
+        placeholder: '',
+        icon: 'bullhorn',
+        color: '#6CD0F7',
+        label: 'Hablando de ti'
+      )
+    %>
+
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @consumptions_unique,
+        outside: @consumptions,
+        placeholder: 'únicas',
+        icon: 'crosshairs',
+        color: '#6CD0F7',
+        label: 'Consumptions'
+      )
+    %>
+
+    <%=
+      render(
+        'widget_task_statistics',
+        inside: @hidden_unique,
+        outside: @hidden,
+        placeholder: '-',
+        icon: 'thumbs-down',
+        color: '#E28270',
+        label: 'Dislike o Hide'
+      )
+    %>
+
+
+  </div>
+</div>
+
+<%= yield :modals %>

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

@@ -1,13 +1,13 @@
 <% provide(:page_title, "Google Analytics") -%>
 <% content_for :scripts do %>
-	<%#= javascript_include_tag "adminpanel/analytics/analytics" %>
+  <%#= javascript_include_tag "adminpanel/analytics/analytics" %>
 <% end %>
 <div class="row-fluid">
-	<div class="widget widget-padding span12">
-		<div class="widget-header">
-			<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 %>
-	</div>
+  <div class="widget widget-padding span12">
+    <div class="widget-header">
+      <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 %>
+  </div>
 </div>

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

@@ -1,15 +1,15 @@
 <% @galleries.each do |gallery| %>
-	<tr>
-		<td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
-		<td>
-			<%= 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>
-			<%= render 'shared/show_icon_button', resource: gallery %>
-			<%= render 'shared/edit_icon_button', resource: gallery %>
+  <tr>
+    <td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
+    <td>
+      <%= 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>
+      <%= render 'shared/show_icon_button', resource: gallery %>
+      <%= render 'shared/edit_icon_button', resource: gallery %>
 
-			<%= render 'shared/delete_icon_button', resource: gallery %>
-		</td>
-	</tr>
+      <%= render 'shared/delete_icon_button', resource: gallery %>
+    </td>
+  </tr>
 <% end %>

data/app/views/adminpanel/galleries/move_better.js.erb

@@ -1 +1 @@
-$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");
+$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");

data/app/views/adminpanel/galleries/move_worst.js.erb

@@ -1 +1 @@
-$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");
+$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");

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

@@ -1,10 +1,10 @@
 <table class="table table-striped table-bordered">
-	<tr>
-	 <th><%= t("section.name") %></th>
-	 <th><%= t("section.description") %></th>
-	 <th><%= t("actions") %></th>
-	</tr>
-	<% sections.each do |section| %>
+  <tr>
+   <th><%= t("section.name") %></th>
+   <th><%= t("section.description") %></th>
+   <th><%= t("actions") %></th>
+  </tr>
+  <% sections.each do |section| %>
         <tr>
           <td><%= link_to section.name, section_path(section) %></td>
           <td><%= strip_tags section.description %></td>
@@ -12,6 +12,6 @@
             <%= render 'shared/edit_icon_button', resource: section, resource_name: @model.display_name %>
           </td>
         </tr>
-	<% end %>
+  <% end %>
 
 </table>