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

Merge branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Kyle Drake 2014-10-27 16:34:09 -07:00
commit 8613505cd6
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sass/_project-sass/_project-Main.scss
View file

@ -384,6 +384,12 @@
width: 100%;
position: relative;
border-right: 1px solid #ddd;
h2 {
margin-top: 1em;
float: left;
width: 100%;
margin-bottom: .75em;
}
}
.right-col {
background: #FAF6F1;

33
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? || params[:activity] == 'mine' %>
<% if !@events.empty? && (site.followings_dataset.count > 0) %>
<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 %>>
@ -23,24 +23,33 @@
<div class="content misc-page columns right-col">
<div class="col-left">
<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 %>
<% if site.followings_dataset.count == 0 %>
<div class="welcome">
<h4>Welcome to your Neocities news feed!</h4>
<p>
You aren’t following any websites yet! Once you do, more updates will show up here.
You aren’t following any websites yet! Once you do, <% if !@events.empty? %>more<% end %> updates will show up here.
Here are some website suggestions for you. Want to find some sites to follow? <a href="/browse">Check out all the sites on Neocities!</a>
Below are some website suggestions for you. For more, <a href="/browse">check out all the sites on Neocities</a>!
</p>
</div>
<% end %>
<% if !site.site_changed && site.followings_dataset.count > 0 %>
<div class="welcome">
<h4>Thanks for joining the Neocities community!</h4>
<p>Now start <a href="/dashboard">building your website</a>!</a>
</p>
</div>
<% end %>
<% if !@events.empty? %>
<%== erb :'_news', layout: false, locals: {site: current_site, events: @events} %>
<% end %>
<% if site.followings_dataset.count == 0 %>
<% if !@events.empty? %><h2>Sites to Follow</h2><% end %>
<ul class="row website-Gallery content int-Gall suggestions">
<% @suggestions.each do |suggested_site| %>
<li>