bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

gallery fixes

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-28 15:02:22 +01:00
parent f07925701d
commit 62b6f8ca88
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/fotos_controller.rb
View File

@@ -20,9 +20,9 @@ class FotosController < ApplicationController
@openfotoid=@foto.id
@pppage=params[:pppage].to_i % 4
@pppage_array = [ 25 , 50 , 100, 10000]
@page = params[:page].nil? ? 1 : params[:page].to_i
@page = params[:page].nil? ? 1 : params[:page].to_i
@fotos_p = @gallery.fotos.page(@page).per(@pppage_array[@pppage])
@fotos_p = @gallery.fotos.page(@page).per(@pppage_array[@pppage])
@fotos_n = @gallery.fotos- @fotos_p
respond_to do |format|
format.html {

2
app/controllers/galleries_controller.rb
View File

@@ -19,7 +19,7 @@ class GalleriesController < ApplicationController
def show
@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
if !params[:pppage].nil? && params[:pppage].to_i <= 3 && params[:pppage].to_i >= 0

7
app/views/galleries/show.html.erb
View File

@@ -63,7 +63,8 @@ end
</style>
<div class="fluid-row">
<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>
<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
@@ -72,7 +73,7 @@ end
<% # end %>
<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==@pages ? @page : @page+1)} %>"><%=I18n.t('fotos.next')%></a></li>
</ul>
</div>
</div>-->
</div>
<div class="span3"> <!-- size selector -->
<div class="pull-right">
@@ -168,7 +169,7 @@ end
<% end %>
<%= render 'layouts/pretty_toolbar' %>
</div>
<%= @pppage_array[@pppage] %>
<%= javascript_include_tag "blueimp-gallery-all" %>
<script>