diff --git a/Gemfile b/Gemfile
index f7f71d0..ed8dbe1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,8 @@ gem 'cancan'
gem 'rolify'
gem 'simple_form'
+gem 'kaminari'
+gem 'kaminari-bootstrap', '~> 0.1.3'
gem 'inherited_resources'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87f64b3..5b004f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -216,6 +216,9 @@ GEM
kaminari (0.15.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
+ kaminari-bootstrap (0.1.3)
+ kaminari (>= 0.13.0)
+ rails
launchy (2.4.2)
addressable (~> 2.3)
less (2.5.0)
@@ -444,6 +447,8 @@ DEPENDENCIES
httmultiparty
inherited_resources
jquery-rails
+ kaminari
+ kaminari-bootstrap (~> 0.1.3)
launchy
less-rails
mysql2
diff --git a/app/assets/stylesheets/v_libras/videos.css.scss b/app/assets/stylesheets/v_libras/videos.css.scss
index 6b6b8a1..6fe8374 100644
--- a/app/assets/stylesheets/v_libras/videos.css.scss
+++ b/app/assets/stylesheets/v_libras/videos.css.scss
@@ -9,4 +9,8 @@
.table-requests .label {
text-transform: lowercase;
+}
+
+.videos-row {
+ margin: 20px 0px;
}
\ No newline at end of file
diff --git a/app/controllers/v_libras/videos_controller.rb b/app/controllers/v_libras/videos_controller.rb
index ef72eea..880a382 100644
--- a/app/controllers/v_libras/videos_controller.rb
+++ b/app/controllers/v_libras/videos_controller.rb
@@ -7,7 +7,7 @@ class VLibras::VideosController < InheritedResources::Base
before_filter :mark_as_seen!, :only => [ :show ]
def index
- @videos = current_user.videos
+ @videos = current_user.videos.page(params[:page]).per(9)
@requests = current_user.requests.limit(6)
end
diff --git a/app/views/v_libras/videos/index.haml b/app/views/v_libras/videos/index.haml
index 4e63dd8..2575dcd 100644
--- a/app/views/v_libras/videos/index.haml
+++ b/app/views/v_libras/videos/index.haml
@@ -6,45 +6,52 @@
.breadcrumb
%h3= t('videos.list')
-- @videos.in_groups_of(3, false) do |group|
- .row-fluid.text-center
- - for video in group
- .span4
- .ribbon-wrapper-green
- .ribbon-content
- = link_to image_tag(video.thumb), video
- - unless video.seen
- .ribbon-green Novo
+.well
+ - @videos.in_groups_of(3, false) do |group|
+ .row-fluid.text-center.videos-row
+ - for video in group
+ .span4
+ .ribbon-wrapper-green
+ .ribbon-content
+ = link_to image_tag(video.thumb), video
+ - unless video.seen
+ .ribbon-green Novo
- %div
- %span
- = link_to video.url_mp4, class: "btn btn-success" do
- = content_tag(:span, '', :class => 'icon-download icon-white')
- Baixar
+ %div
+ %span
+ = link_to video.url_mp4, class: "btn btn-success" do
+ = content_tag(:span, '', :class => 'icon-download icon-white')
+ Baixar
- %span
- = link_to content_tag(:span, '', :class => 'icon-trash icon-white'), v_libras_video_path(video), method: :delete,
- class: "btn btn-danger", data: { confirm: t('shared.confirm_delete') }
+ %span
+ = link_to content_tag(:span, '', :class => 'icon-trash icon-white'), v_libras_video_path(video), method: :delete,
+ class: "btn btn-danger", data: { confirm: t('shared.confirm_delete') }
+
+
+ .row-fluid.text-center.pagination
+ .row12
+ = paginate @videos
- if @requests.any?
.breadcrumb.requests
%h4= t('requests.list')
- .row-fluid
- .span8.offset2
- %table.table.table-hover.table-striped.table-requests
- %thead
- %tr
- %th Situação
- %th Vídeo
- %th Criado há
+ .well
+ .row-fluid
+ .span8.offset2
+ %table.table.table-hover.table-striped.table-requests
+ %thead
+ %tr
+ %th Situação
+ %th Vídeo
+ %th Criado há
- - @requests.each do |request|
- %tr
- %td.span2= request_status_label(request)
- %td.span5= request.video_filename
- %td.span5= time_ago_in_words(request.created_at)
+ - @requests.each do |request|
+ %tr
+ %td.span2= request_status_label(request)
+ %td.span5= request.video_filename
+ %td.span5= time_ago_in_words(request.created_at)
- if params['video-wait']
diff --git a/config/locales/pagination.pt-BR.yml b/config/locales/pagination.pt-BR.yml
new file mode 100644
index 0000000..d6e3302
--- /dev/null
+++ b/config/locales/pagination.pt-BR.yml
@@ -0,0 +1,17 @@
+pt-BR:
+ views:
+ pagination:
+ first: "« Primeiro"
+ last: "Último »"
+ previous: "‹ Anterior"
+ next: "Próximo ›"
+ truncate: "…"
+ helpers:
+ page_entries_info:
+ one_page:
+ display_entries:
+ zero: "Nenhum %{entry_name} encontrado"
+ one: "Mostrando 1 %{entry_name}"
+ other: "Mostrando todos os %{count} %{entry_name}"
+ more_pages:
+ display_entries: "Mostrando %{entry_name} %{first} - %{last} de %{total} no total"
\ No newline at end of file
--
libgit2 0.21.2