From 51d08d9798f029a47286d037e97557460a21f01b Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 20 Aug 2015 12:35:00 +0200 Subject: [PATCH 1/4] Adds styles for pagination --- app/assets/stylesheets/participacion.scss | 12 +++++++ app/views/kaminari/_first_page.html.erb | 14 ++------ app/views/kaminari/_gap.html.erb | 11 ++----- app/views/kaminari/_last_page.html.erb | 14 ++------ app/views/kaminari/_next_page.html.erb | 14 ++------ app/views/kaminari/_page.html.erb | 15 ++------- app/views/kaminari/_paginator.html.erb | 40 +++++++++++------------ app/views/kaminari/_prev_page.html.erb | 14 ++------ 8 files changed, 49 insertions(+), 85 deletions(-) diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 88ed47d65..d4442e11c 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -12,6 +12,7 @@ // 10. User account // 11. Filters // 12. Official levels +// 13. Pagination // // 01. Variables @@ -673,3 +674,14 @@ img.initialjs-avatar { .level-5 { background: $level-5; } + +// 13. Pagination +// - - - - - - - - - - - - - - - - - - - - - - - - - + +ul.pagination { + margin-top: rem-calc(24); + + li { + color: $text-medium; + } +} diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index 2682d3415..b9802389d 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -1,11 +1,3 @@ -<%# Link to the "First" page - - available local variables - url: url to the first page - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> - - <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %> - +
  • + <%= link_to t("views.pagination.first").html_safe, url, :remote => remote %> +
    • diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb index bbb0f9839..288e7c69b 100644 --- a/app/views/kaminari/_gap.html.erb +++ b/app/views/kaminari/_gap.html.erb @@ -1,8 +1,3 @@ -<%# Non-link tag that stands for skipped pages... - - available local variables - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> -<%= t('views.pagination.truncate').html_safe %> +
  • + <%= t("views.pagination.truncate").html_safe %> +
    • diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 53d613074..179f6e7fc 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -1,11 +1,3 @@ -<%# Link to the "Last" page - - available local variables - url: url to the last page - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> - - <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %> - +
  • + <%= link_to t("views.pagination.last").html_safe, url, :remote => remote %> +
    • diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index 4fc20712c..05695cd6f 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -1,11 +1,3 @@ -<%# Link to the "Next" page - - available local variables - url: url to the next page - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> - - <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %> - +
  • + <%= link_to t("views.pagination.next").html_safe, url, :rel => "next", :remote => remote %> +
    • diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 582af7bc9..329f36b3f 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -1,12 +1,3 @@ -<%# Link showing page number - - available local variables - page: a page object for "this" page - url: url to this page - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> - - <%= link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> - +
  • + <%= link_to page, url, {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %> +
    • diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb index 4fb445fd3..6e15a545d 100644 --- a/app/views/kaminari/_paginator.html.erb +++ b/app/views/kaminari/_paginator.html.erb @@ -1,23 +1,21 @@ -<%# The container tag - - available local variables - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote - paginator: the paginator that renders the pagination tags inside --%> <%= paginator.render do -%> - +
    + +
    <% end -%> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index 9c4aff49c..f4c5c4041 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -1,11 +1,3 @@ -<%# Link to the "Previous" page - - available local variables - url: url to the previous page - current_page: a page object for the currently displayed page - total_pages: total number of pages - per_page: number of items to fetch per page - remote: data-remote --%> - - <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %> - +
  • + <%= link_to t("views.pagination.previous").html_safe, url, :rel => "prev", :remote => remote %> +
    • From 839314868c7357fd8835d0ac18aeae9ad86cf432 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 20 Aug 2015 12:50:36 +0200 Subject: [PATCH 2/4] adding staging.rb --- config/environments/staging.rb | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 config/environments/staging.rb diff --git a/config/environments/staging.rb b/config/environments/staging.rb new file mode 100644 index 000000000..5c1b32e48 --- /dev/null +++ b/config/environments/staging.rb @@ -0,0 +1,79 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + # config.log_tags = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end From 0d54cca9107328003a0486c4e0b434a3e7441cf9 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 20 Aug 2015 12:55:31 +0200 Subject: [PATCH 3/4] Changes test for pagination --- config/i18n-tasks.yml | 1 + spec/features/comments_spec.rb | 2 +- spec/features/debates_spec.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 14d8b82a7..a7d67ce1c 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -26,6 +26,7 @@ data: - config/locales/moderation.%{locale}.yml - config/locales/devise_views.%{locale}.yml - config/locales/responders.%{locale}.yml + - config/locales/kaminari.%{locale}.yml # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom: # `i18n-tasks normalize -p` will force move the keys according to these rules diff --git a/spec/features/comments_spec.rb b/spec/features/comments_spec.rb index 60f06f169..b820fffcd 100644 --- a/spec/features/comments_spec.rb +++ b/spec/features/comments_spec.rb @@ -27,7 +27,7 @@ feature 'Comments' do visit debate_path(debate) expect(page).to have_css('.comment', count: per_page) - within("nav.pagination") do + within("ul.pagination") do expect(page).to have_content("1") expect(page).to have_content("2") expect(page).to_not have_content("3") diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index cd0706ca8..eade338f5 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -24,7 +24,7 @@ feature 'Debates' do expect(page).to have_selector('#debates .debate', count: per_page) - within("nav.pagination") do + within("ul.pagination") do expect(page).to have_content("1") expect(page).to have_content("2") expect(page).to_not have_content("3") From d70ca040f3e4bc87db6c73d1ba9e90801955e8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 20 Aug 2015 13:10:21 +0200 Subject: [PATCH 4/4] ignores unused kaminari i18n keys --- config/i18n-tasks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index a7d67ce1c..cb06a3360 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -99,6 +99,8 @@ ignore_unused: - 'unauthorized.*' - 'simple_captcha.*' - 'admin.officials.level_*' + - 'helpers.page_entries_info.*' # kaminari + - 'views.pagination.*' # kaminari # - '{devise,kaminari,will_paginate}.*' # - 'simple_form.{yes,no}' # - 'simple_form.{placeholders,hints,labels}.*'