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

This commit is contained in:
Kyle Drake 2014-12-23 00:09:28 +00:00
commit e09609131d
4 changed files with 13 additions and 6 deletions

View file

@ -37,7 +37,7 @@
<li>Using <strong><%= current_site.space_percentage_used %>% (<%= current_site.total_space_used.to_space_pretty %>) of your <%= current_site.maximum_space.to_space_pretty %></strong>. <li>Using <strong><%= current_site.space_percentage_used %>% (<%= current_site.total_space_used.to_space_pretty %>) of your <%= current_site.maximum_space.to_space_pretty %></strong>.
<br> <br>
<% if !current_site.supporter? %>Need more space? <a href="/plan">Become a Supporter!</a><% end %></li> <% if !current_site.supporter? %>Need more space? <a href="/plan">Become a Supporter!</a><% end %></li>
<li><strong><%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %></strong> hits</li> <li><strong><%= current_site.views.format_large_number %></strong> views</li>
</ul> </ul>
</div> </div>

View file

@ -99,8 +99,8 @@
</div> </div>
<div class="col col-50"> <div class="col col-50">
<div><strong><%= site.views.format_large_number %></strong> views</div> <div><strong><%= site.views.format_large_number %></strong> views</div>
<div><strong><%= site.hits.format_large_number %></strong> hits</div> <% follows_count = site.follows_dataset.count %>
<div><strong><%= site.follows_dataset.count.format_large_number %></strong> followers</div> <div><strong><%= follows_count.format_large_number %></strong> follower<%= follows_count == 1 ? '' : 's' %></div>
</div> </div>
</div> </div>
</div> </div>

View file

@ -23,8 +23,8 @@
<p class="site-url"><a href="/surf/<%= site.username %>"><%= site.host %></a></p> <p class="site-url"><a href="/surf/<%= site.username %>"><%= site.host %></a></p>
<div class="stats"> <div class="stats">
<div class="stat"><strong><%= site.views.format_large_number %></strong> <span>views</span></div> <div class="stat"><strong><%= site.views.format_large_number %></strong> <span>views</span></div>
<div class="stat"><strong><%= site.hits.format_large_number %></strong> <span>hits</span></div> <% follows_count = site.follows_dataset.count %>
<div class="stat"><strong><%= site.follows_dataset.count.format_large_number %></strong> <span>followers</span></div> <div class="stat"><strong><%= follows_count.format_large_number %></strong> <span>follower<% follows_count == 0 ? '' : 's' %></span></div>
<!-- <div class="stat tips"><strong><%= site.tips_dataset.count %></strong> <span>tips</span></div> --> <!-- <div class="stat tips"><strong><%= site.tips_dataset.count %></strong> <span>tips</span></div> -->
</div> </div>
<div class="actions"> <div class="actions">

View file

@ -226,7 +226,14 @@
<i class="fa fa-share-alt"></i> Share <i class="fa fa-share-alt"></i> Share
</a> </a>
</li> </li>
<li><a class="close" href="//<%= @site.host %>" alt="close" title="close"></a></li> <% unless signed_in? %>
<li>
<a href="/">Create your own free web site</a>
</li>
<% end %>
<li>
<a class="close" href="//<%= @site.host %>" alt="close" title="close"></a>
</li>
</ul> </ul>
</div> </div>