zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix test, fix home display for own site updates

Browse source
This commit is contained in:
Kyle Drake 2014-10-20 17:39:23 -07:00
parent 8d592bb982
commit 39a7b93cc1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/acceptance/site_tests.rb
View file

@ -30,7 +30,7 @@ describe 'site page' do
visit "/browse?tag=#{tag}"
page.find('.website-Gallery .title a')['href'].must_match /#{blocked_site.host}/
page.find('.website-Gallery .title a')['href'].must_match /\/surf\/#{blocked_site.username}/
visit "/site/#{blocked_site.username}"

8
views/home.erb
View file

@ -3,7 +3,7 @@
<div class="col col-66">
<h3>Your Feed</h3>
<div class="feed-filter">
<% if !@events.empty? %>
<% if !@events.empty? || params[:activity] == 'mine' %>
<a href="/" <% if params[:activity] != 'mine' %>class="selected"<% end %>>All Activity</a>
&nbsp;&nbsp;
<a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>
@ -25,6 +25,12 @@
<div class="col col-66">
<% if !@events.empty? %>
<%== erb :'_news', layout: false, locals: {site: current_site, events: @events} %>
<% elsif params[:activity] == 'mine' %>
<div class="welcome">
<h4>No updates on your site yet!</h4>
<p>
You should <a href="/dashboard">start editing your site</a>!
</div>
<% else %>
<div class="welcome">
<h4>Welcome to your Neocities news feed!</h4>