zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

some fixes to browse

Browse source
This commit is contained in:
Kyle Drake 2015-07-21 19:38:41 -07:00
parent 91640d87b6
commit aca48d3b0d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/browse.rb
View file

@ -28,9 +28,12 @@ def education_sites_dataset
end end
def browse_sites_dataset def browse_sites_dataset
site_dataset = Site.filter(is_deleted: false, is_banned: false, is_crashing: false).filter(site_changed: true)
site_dataset = Site.where(is_deleted: false, is_banned: false, is_crashing: false, site_changed: true)
if current_site if current_site
site_dataset.or! sites__id: current_site.id
if !current_site.blocking_site_ids.empty? if !current_site.blocking_site_ids.empty?
site_dataset.where!(Sequel.~(Sequel.qualify(:sites, :id) => current_site.blocking_site_ids)) site_dataset.where!(Sequel.~(Sequel.qualify(:sites, :id) => current_site.blocking_site_ids))
end end

8
views/browse.erb
View file

@ -37,8 +37,6 @@
</select> </select>
</div> </div>
<input name="tag" type="hidden" value="<%= params[:tag] %>">
<!-- <!--
<div> <div>
<input name="is_nsfw" type="checkbox" value="true" <%= params[:is_nsfw].to_s == 'true' ? 'checked' : '' %>> Show 18+ content <input name="is_nsfw" type="checkbox" value="true" <%= params[:is_nsfw].to_s == 'true' ? 'checked' : '' %>> Show 18+ content
@ -51,10 +49,14 @@
<div class="col col-50 filter"> <div class="col col-50 filter">
<form method="GET" action="browse"> <form method="GET" action="browse">
<fieldset class="grouping"> <fieldset class="grouping">
<% unless is_education? || params[:sort_by] == 'followers' %> <% unless is_education? %>
<label class="text-Label" for="tag"><span class="hide-on-mobile">Filter by </span>Tag:</label> <label class="text-Label" for="tag"><span class="hide-on-mobile">Filter by </span>Tag:</label>
<input class="input-Area typeahead" id="tag" name="tag" type="text" placeholder="pokemon" value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto"> <input class="input-Area typeahead" id="tag" name="tag" type="text" placeholder="pokemon" value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto">
<input style="vertical-align: -4px;margin-left: 4px;" type="submit" class="btn-Action" value="Filter"> <input style="vertical-align: -4px;margin-left: 4px;" type="submit" class="btn-Action" value="Filter">
<% else %>
<% if params[:tag] %>
<input name="tag" type="hidden" value="<%= params[:tag] %>">
<% end %>
<% end %> <% end %>
</fieldset> </fieldset>
</div> </div>