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

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Victoria Wang 2015-02-18 00:00:35 -06:00
commit c3b58beb68
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/activity.rb
View file

@ -1,5 +1,5 @@
get '/activity' do get '/activity' do
expires 7200, :public, :must_revalidate if self.class.production? # 2 hours #expires 7200, :public, :must_revalidate if self.class.production? # 2 hours
params[:activity] = 'global' # FIXME this is a bad hack params[:activity] = 'global' # FIXME this is a bad hack
@events = Event.global_dataset.all @events = Event.global_dataset.all
erb :'activity' erb :'activity'

2
views/_news.erb
View file

@ -61,7 +61,7 @@
<% site_change_filenames.each do |f| %> <% site_change_filenames.each do |f| %>
<div class="file"> <div class="file">
<div class="html-thumbnail <%= site_change_file_display_class f %>"> <div class="html-thumbnail <%= site_change_file_display_class f %>">
<a href="//<%= event_site.host %><%= f == 'index.html' ? '' : "/#{f}" %>"> <a href="http://<%= event_site.host %><%= f == 'index.html' ? '' : "/#{f}" %>">
<% if site_change_file_display_class(f) == 'html' %> <% if site_change_file_display_class(f) == 'html' %>
<img src="<%= event_site.screenshot_url(f, '210x158') %>"> <img src="<%= event_site.screenshot_url(f, '210x158') %>">
<% elsif site_change_file_display_class(f) == 'image' %> <% elsif site_change_file_display_class(f) == 'image' %>