diff --git a/app/index.rb b/app/index.rb index f621b986..e2387619 100644 --- a/app/index.rb +++ b/app/index.rb @@ -13,6 +13,8 @@ get '/?' do event = Event.select(:id).where(id: params[:event_id]).first not_found if event.nil? events_dataset = Event.where(id: params[:event_id]).paginate(1, 1) + elsif params[:activity] == 'global' + events_dataset = Event.select_all(:events).order(:created_at.desc).paginate(@current_page, 100).join_table(:inner, :sites, id: :site_id).where{views > 1500}.or(site_change_id: nil) else events_dataset = current_site.news_feed(@current_page, 10) end @@ -62,4 +64,4 @@ end get '/press' do erb :'press' -end \ No newline at end of file +end diff --git a/views/_news.erb b/views/_news.erb index 1e950c52..11f10fde 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -32,7 +32,7 @@ <% if current_site && event_site.id == current_site.id %> you <% else %> - the site of + the site of <% if event_site.supporter? %><% end %><%= event_site.username %> <% end %> @@ -123,27 +123,29 @@ <% end %> -
- <% if @page_count > 1 %> - + <% end %> +
+<% end %> <%== erb :'_news_templates', layout: false %> diff --git a/views/home.erb b/views/home.erb index cb9961e8..d612daad 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,15 +1,22 @@
-

Your Feed

+

+ <% if params[:activity] == 'global' %> + Global Feed + <% else %> + Your Feed + <% end %> +

@@ -33,7 +40,7 @@

<% end %> - + <% if !site.site_changed && site.followings_dataset.count > 0 %>

Thanks for joining the Neocities community!

@@ -45,7 +52,7 @@ <% if !@events.empty? %> <%== erb :'_news', layout: false, locals: {site: current_site, events: @events} %> <% end %> - + <% if site.followings_dataset.count == 0 %> <% if !@events.empty? %>

Sites to Follow

<% end %>
<% if suggested_site.tags.count > 0 %> - + <% suggested_site.tags.each_with_index do |tag, index| %> - <%= tag.name %><% if index != suggested_site.tags.length - 1 %>,<% end %> + <%= tag.name %><% if index != suggested_site.tags.length - 1 %>,<% end %> <% end %> <% end %>