gallery fixes
This commit is contained in:
@@ -19,7 +19,7 @@ class GalleriesController < ApplicationController
|
|||||||
def show
|
def show
|
||||||
@gallery = Gallery.find(params[:id])
|
@gallery = Gallery.find(params[:id])
|
||||||
|
|
||||||
@pppage_array = [ 25 , 50 , 100, "all"] #defines number & size of picture chunks
|
@pppage_array = [ 25 , 50 , 100, 10000] #defines number & size of picture chunks
|
||||||
@pppage = 0 #starting index of pppage_array
|
@pppage = 0 #starting index of pppage_array
|
||||||
|
|
||||||
if !params[:pppage].nil? && params[:pppage].to_i <= 3 && params[:pppage].to_i >= 0
|
if !params[:pppage].nil? && params[:pppage].to_i <= 3 && params[:pppage].to_i >= 0
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ end
|
|||||||
</style>
|
</style>
|
||||||
<div class="fluid-row">
|
<div class="fluid-row">
|
||||||
<div class="span9"> <!-- pagination-->
|
<div class="span9"> <!-- pagination-->
|
||||||
<div class="pagination pull_left" style="margin:0px 0px 0px 0px">
|
<%= paginate @fotos_p , theme:'twitter-bootstrap' %>
|
||||||
|
<!-- <div class="pagination pull_left" style="margin:0px 0px 0px 0px">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==1 ? @page : @page-1)} %>"><%=I18n.t('fotos.prev')%></a></li>
|
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==1 ? @page : @page-1)} %>"><%=I18n.t('fotos.prev')%></a></li>
|
||||||
<% # for i in 1..@pages do
|
<% # for i in 1..@pages do
|
||||||
@@ -72,7 +73,7 @@ end
|
|||||||
<% # end %>
|
<% # end %>
|
||||||
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==@pages ? @page : @page+1)} %>"><%=I18n.t('fotos.next')%></a></li>
|
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==@pages ? @page : @page+1)} %>"><%=I18n.t('fotos.next')%></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="span3"> <!-- size selector -->
|
<div class="span3"> <!-- size selector -->
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
@@ -168,7 +169,7 @@ end
|
|||||||
<% end %>
|
<% end %>
|
||||||
<%= render 'layouts/pretty_toolbar' %>
|
<%= render 'layouts/pretty_toolbar' %>
|
||||||
</div>
|
</div>
|
||||||
<%= @pppage_array[@pppage] %>
|
|
||||||
<%= javascript_include_tag "blueimp-gallery-all" %>
|
<%= javascript_include_tag "blueimp-gallery-all" %>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in New Issue
Block a user