zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-06-24 05:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

improvements to pagination

Browse source
This commit is contained in:
Kyle Drake 2016-01-06 14:46:57 -08:00
parent 7714dc7c53
commit 32b4fe0d49
9 changed files with 38 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

21
views/_news.erb
View file

@ -126,26 +126,7 @@
<% if params[:activity] != 'global' %>
<div class="content">
<% if @page_count > 1 %>
<div class="txt-Center content eps pagination">
<% if @current_page != 1 %>
<a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="fa fa-arrow-left arrow"></i></a>&nbsp;
<% end %>
<% 1.upto(@page_count) do |num| %>
<% if num == @current_page %>
<%= num %>&nbsp;
<% else %>
<a href="#" onclick="getPage(<%= num %>); return false"><%= num %></a>&nbsp;
<% end %>
<% end %>
<% if @current_page != @page_count %>
<a href="#" onclick="getPage(<%= @current_page + 1 %>); return false"><i class="fa fa-arrow-right arrow"></i></a>
<% end %>
</div>
<% end %>
<%== erb :_pagination, layout: false %>
</div>
<% end %>

30
views/browse.erb
View file

@ -1,10 +1,10 @@
<script type="text/javascript">
function getPage(currentPage) {
document.location.href = '/browse?current_page='+currentPage+'&'+$('#search_criteria').serialize();
function getPage(page) {
document.location.href = '/browse?page='+page+'&'+$('#search_criteria').serialize();
}
function surf(currentPage) {
document.location.href = '/surf?current_page='+currentPage+'&'+$('#search_criteria').serialize();
function surf(page) {
document.location.href = '/surf?page='+page+'&'+$('#search_criteria').serialize();
}
</script>
@ -76,7 +76,7 @@
<ul class="row website-Gallery content int-Gall">
<% @sites.each_with_index do |site,i| %>
<li id="username_<%= site.username %>">
<a href="<%= site.uri %>" class="neo-Screen-Shot" title="<%= site.title %>" onclick="surf(<%= ((@current_page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false">
<a href="<%= site.uri %>" class="neo-Screen-Shot" title="<%= site.title %>" onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false">
<span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;">
<img src="/img/placeholder.png" alt="<%= site.title %>" />
</span>
@ -147,25 +147,7 @@
<% end %>
<% if params[:sort_by] != 'random' %>
<% if @page_count > 1 %>
<div class="txt-Center content eps pagination">
<% if @current_page != 1 %>
<a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="fa fa-arrow-left arrow"></i></a>&nbsp;
<% end %>
<% 1.upto(@page_count) do |num| %>
<% if num == @current_page %>
<%= num %>&nbsp;
<% else %>
<a href="#" onclick="getPage(<%= num %>); return false"><%= num %></a>&nbsp;
<% end %>
<% end %>
<% if @current_page != @page_count %>
<a href="#" onclick="getPage(<%= @current_page + 1 %>); return false"><i class="fa fa-arrow-right arrow"></i></a>
<% end %>
</div>
<% end %>
<%== erb :'_pagination', layout: false %>
<% end %>
<% unless is_education? %>

16
views/surf.erb
View file

@ -168,8 +168,8 @@
</head>
<body>
<script type="text/javascript">
function getPage(currentPage) {
document.location.href = '/surf?current_page='+currentPage+'&'+$('#search_criteria').serialize()
function getPage(page) {
document.location.href = '/surf?page='+page+'&'+$('#search_criteria').serialize()
}
function backToBrowse() {
@ -180,9 +180,9 @@
<div id="top-bar">
<ul class="browse-actions">
<li>
<a href="/browse" onclick="backToBrowse(<%= @current_page %>); return false">Neocities</a>
<a href="/browse" onclick="backToBrowse(<%= @page %>); return false">Neocities</a>
</li>
<% if @current_page %>
<% if @page %>
<li>
<form id="search_criteria" onsubmit="getPage(1); return false">
<input type="hidden" name="sort_by" value="<%= params[:sort_by] %>">
@ -191,15 +191,15 @@
</form>
</li>
<li>
<% if @current_page > 1 %>
<a href="" onclick="getPage(<%= @current_page - 1 %>); return false">
<% if @page > 1 %>
<a href="" onclick="getPage(<%= @page - 1 %>); return false">
<i class="fa fa-caret-left"></i> Prev
</a>
<% end %>
</li>
<li>
<% if @current_page != @page_count %>
<a href="" onclick="getPage(<%= @current_page + 1 %>); return false">Next <i class="fa fa-caret-right"></i></a>
<% if @page != @page_count %>
<a href="" onclick="getPage(<%= @page + 1 %>); return false">Next <i class="fa fa-caret-right"></i></a>
<% end %>
</li>
<% end %>