contour 1.1.1 → 1.1.2.pre

data/app/views/contour/layouts/_per_page.html.erb

@@ -1,4 +1,4 @@
-<div class="pagination pagination-right">
+<div class="pagination pagination-right <%= "pagination-#{pagination_size}" if defined?(pagination_size) and ['large', 'small', 'mini'].include?(pagination_size) %>">
   <ul>
     <li class="disabled"><a href="#">Per Page</a></li>
     <li class="active per_page"><%= link_to (defined?(per_page) and per_page ? per_page : 20), "#" %></li>

data/app/views/kaminari/contour-large/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>

data/app/views/kaminari/contour-large/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><%= link_to raw(t 'views.pagination.truncate'), '#' %></li>

data/app/views/kaminari/contour-large/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>

data/app/views/kaminari/contour-large/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/contour-large/_page.html.erb

@@ -0,0 +1,12 @@
+<%# 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
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/contour-large/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_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 -%>
+  <nav class="pagination pagination-centered pagination-large">
+    <ul>
+      <%= first_page_tag %> <%# unless current_page.first? %>
+      <%= prev_page_tag %> <%# unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag %> <%# unless current_page.last? %>
+      <%= last_page_tag %> <%# unless current_page.last? %>
+    </ul>
+  </nav>
+<% end -%>

data/app/views/kaminari/contour-large/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="prev">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

data/app/views/kaminari/contour-mini/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>

data/app/views/kaminari/contour-mini/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><%= link_to raw(t 'views.pagination.truncate'), '#' %></li>

data/app/views/kaminari/contour-mini/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>

data/app/views/kaminari/contour-mini/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/contour-mini/_page.html.erb

@@ -0,0 +1,12 @@
+<%# 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
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/contour-mini/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_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 -%>
+  <nav class="pagination pagination-centered pagination-mini">
+    <ul>
+      <%= first_page_tag %> <%# unless current_page.first? %>
+      <%= prev_page_tag %> <%# unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag %> <%# unless current_page.last? %>
+      <%= last_page_tag %> <%# unless current_page.last? %>
+    </ul>
+  </nav>
+<% end -%>

data/app/views/kaminari/contour-mini/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="prev">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

data/app/views/kaminari/contour-small/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>

data/app/views/kaminari/contour-small/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><%= link_to raw(t 'views.pagination.truncate'), '#' %></li>

data/app/views/kaminari/contour-small/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>

data/app/views/kaminari/contour-small/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/contour-small/_page.html.erb

@@ -0,0 +1,12 @@
+<%# 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
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/contour-small/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_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 -%>
+  <nav class="pagination pagination-centered pagination-small">
+    <ul>
+      <%= first_page_tag %> <%# unless current_page.first? %>
+      <%= prev_page_tag %> <%# unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag %> <%# unless current_page.last? %>
+      <%= last_page_tag %> <%# unless current_page.last? %>
+    </ul>
+  </nav>
+<% end -%>

data/app/views/kaminari/contour-small/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="prev">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

data/app/views/kaminari/contour/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>

data/app/views/kaminari/contour/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><%= link_to raw(t 'views.pagination.truncate'), '#' %></li>

data/app/views/kaminari/contour/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>

data/app/views/kaminari/contour/_next_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next">
+  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/contour/_page.html.erb

@@ -0,0 +1,12 @@
+<%# 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
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/contour/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_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 -%>
+  <nav class="pagination pagination-centered">
+    <ul>
+      <%= first_page_tag %> <%# unless current_page.first? %>
+      <%= prev_page_tag %> <%# unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag %> <%# unless current_page.last? %>
+      <%= last_page_tag %> <%# unless current_page.last? %>
+    </ul>
+  </nav>
+<% end -%>

data/app/views/kaminari/contour/_prev_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="prev">
+  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

data/contour.gemspec

@@ -23,16 +23,16 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["CHANGELOG.rdoc", "contour.gemspec", "LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails',                   '~> 3.2.8'
-  s.add_dependency 'jquery-rails',            '~> 2.1.2'
+  s.add_dependency 'rails',                   '~> 3.2.9'
+  s.add_dependency 'jquery-rails',            '~> 2.1.4'
   s.add_dependency 'devise',                  '~> 2.1.2'
   s.add_dependency 'omniauth',                '~> 1.1.1'
-  s.add_dependency 'omniauth-cas',            '~> 0.0.7'
+  s.add_dependency 'omniauth-cas',            '~> 1.0.0'
   s.add_dependency 'omniauth-facebook',       '~> 1.4.1'
   s.add_dependency 'omniauth-ldap',           '~> 1.0.2'
   s.add_dependency 'omniauth-linkedin',       '~> 0.0.8'
   s.add_dependency 'omniauth-openid',         '~> 1.0.1'
-  s.add_dependency 'omniauth-twitter',        '~> 0.0.13'
+  s.add_dependency 'omniauth-twitter',        '~> 0.0.14'
 
   s.add_development_dependency "sqlite3"
 end

data/lib/contour/version.rb

@@ -2,8 +2,8 @@ module Contour
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY = 1
-    BUILD = nil # nil, "pre", "rc", "rc2"
+    TINY = 2
+    BUILD = "pre" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end