use a single footer

This commit is contained in:
Kyle Drake 2014-04-14 10:04:30 -07:00
parent 5d931efd7f
commit d30ecb5e1d
8 changed files with 79 additions and 104 deletions

View file

@ -3,3 +3,52 @@
[![Build Status](https://travis-ci.org/neocities/neocities.png?branch=master)](https://travis-ci.org/neocities/neocities)
The web site for NeoCities! It's open source. Want a feature on the site? Send a pull request!
## Installation (OSX)
Install homebrew:
```
ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
```
Install deps:
```
$ brew install redis postgresql phantomjs libmagic imagemagick
```
Fork the repository on Github.
Clone the forked repo to your local machine: git clone git@github.com:YOURUSERNAME/neocities.git
Install deps:
```
$ cd neocities
$ gem install bundler
$ bundle install
```
Create postgres databases:
```
createdb neocities_test
createdb neocities_dev
```
Copy config.yml.template to config.yml and edit to something like this:
```
development:
database: 'postgres://neocities@127.0.0.1/neocities_dev'
database_pool: 1
session_secret: SECRET1234
recaptcha_public_key: ENTER RECAPTCHA PUBLIC KEY HERE
recaptcha_private_key: ENTER RECAPTCHA PRIVATE KEY HERE
sidekiq_user: sidekiq
sidekiq_pass: sidekiq
phantomjs_url:
- http://localhost:8910
```
Run the tests to see if they work:
```
bundle exec rake test
```

20
views/_footer.erb Normal file
View file

@ -0,0 +1,20 @@
<aside class="footer-Outro">
<div class="footer-Content">
<div class="row">
<p class="tiny col col-60 credits">
<a href="http://neocities.org" title="NeoCities.org">Neocities.org</a> is a <a href="https://github.com/neocities" title="Neocities on GitHub" style="text-decoration: underline">completely open source</a> startup. <a href="https://twitter.com/neocitiesweb" style="text-decoration: underline">Follow us on twitter</a>.
</p>
<nav class="footer-Nav col col-40">
<ul class="tiny h-Nav">
<!-- <li><a href="api" title="Neocities API">API</a></li> -->
<li><a href="terms" title="Neocities Terms of Use" rel="nofollow">Terms</a></li>
<li><a href="privacy" title="Neocities Privacy Policy" rel="nofollow">Privacy</a></li>
<li><a href="contact" title="Contact Us" rel="nofollow">Contact</a></li>
</ul>
</nav>
</div> <!-- end .row -->
</div>
</aside>

View file

@ -1,22 +0,0 @@
<footer class="footer-Base">
<aside class="footer-Outro">
<div class="footer-Content">
<div class="row">
<p class="tiny col col-60 credits">
<a href="http://neocities.org" title="NeoCities.org">Neocities.org</a> is an <a href="https://github.com/neocities" title="Neocities on GitHub">open source</a> company.
</p>
<nav class="footer-Nav col col-40">
<ul class="tiny h-Nav">
<!-- <li><a href="api" title="Neocities API">API</a></li> -->
<li><a href="terms" title="Neocities Terms of Use" rel="nofollow">Terms</a></li>
<li><a href="privacy" title="Neocities Privacy Policy" rel="nofollow">Privacy</a></li>
<li><a href="contact" title="Contact Us" rel="nofollow">Contact</a></li>
</ul>
</nav>
</div> <!-- end .row -->
</div>
</aside>
</footer>

View file

@ -44,7 +44,7 @@
<% @sites.each do |site| %>
<li>
<a href="http://<%= site.username %>.neocities.org" class="neo-Screen-Shot" target="_blank" title="Website of <%= site.username %>">
<span class="img-Holder" style="background:url(https://neocities.org/site_screenshots/<%= site.username %>.jpg) no-repeat;">
<span class="img-Holder" style="background:url(/site_screenshots/<%= site.username %>.jpg) no-repeat;">
<img src="/img/placeholder.png" alt="<%= site.username %>" />
</span>
</a>

View file

@ -319,25 +319,7 @@
</div>
</section>
<aside class="footer-Outro">
<div class="footer-Content">
<div class="row">
<p class="tiny col col-60 credits">
<a href="http://neocities.org" title="NeoCities.org">Neocities.org</a> is an <a href="https://github.com/neocities" title="Neocities on GitHub">open source</a> company.
</p>
<nav class="footer-Nav col col-40">
<ul class="tiny h-Nav">
<!-- <li><a href="api" title="NeoCities API">API</a></li> -->
<li><a href="terms" title="NeoCities Terms of Use" rel="nofollow">Terms</a></li>
<li><a href="privacy" title="NeoCities Privacy Policy" rel="nofollow">Privacy</a></li>
<li><a href="contact" title="Contact Us" rel="nofollow">Contact</a></li>
</ul>
</nav>
</div>
</div>
</aside>
<%= erb :'_footer', layout: false%>
</footer>
</div> <!-- end .page -->

View file

@ -1,37 +0,0 @@
.row
.span12.text-center
h1 Your free home page is waiting.. once again.
h3 NeoCities allows you to create your own free web site!
div style="margin-top: 30px"
.row
.span4
a.btn.btn-large.btn-success style="font-size: 20pt; margin-bottom: 30px" href="/browse" Browse Existing Sites
a.btn.btn-large.btn-success style="font-size: 20pt" href="/new" Create a Web Site
h5 Returning users: <a href="/signin">Sign In</a>
.span8
.row
.span4
strong What kind of look and feel can my web site have?
p Anything you want! It's just HTML. It's your site, your vision. You can make it as normal or crazy as you want. You're the artist, you're in control. Make a site about you, or make it a guide to playing Dungeons and Dragons, or a maintenance guide for 5-wheeled bicycles. Make a Daft Punk Fan Site.. or a Daft Punk Sucks Site.
.span4
strong How much space do I get?
p 10 Megabytes. You can have HTML, Images, Text, CSS, Markdown, and JavaScript. That's it.
p Why so low? Because we're trying to promote information and content creation, rather than media aggregation. We will probably raise this in the future as we start to understand how to grow this site sustainably.
.row
.span4
strong What information can I put on it?
p Almost anything, as long as it's not illegal to host it. We don't care if it offends somebody, or you remain anonymous. And no spam.
.span4
strong Do I own my content?
p Yes, you do. It's yours. We're just giving you a place to host it.
.row
.span4
strong How are you paying for this?
p With donations. If you feel this is a useful service,<br><a href="/about">help us by contributing!</a>
.row
.span6.offset3
h4 style="line-height: 22pt" There are <b>#{Server.first.slots_available}</b> web site spaces remaining.<br>After that, we need your help to get another server.
div.text-center: a class="btn btn-large btn-success" href="/about" Help Neocities Prosper

View file

@ -60,25 +60,7 @@
</main>
<footer class="footer-Base">
<aside class="footer-Outro">
<div class="footer-Content">
<div class="row">
<p class="tiny col col-60 credits">
<a href="https://neocities.org" title="NeoCities.org">Neocities.org</a> is an <a href="https://github.com/neocities" title="Neocities on GitHub">open source</a> company.
</p>
<nav class="footer-Nav col col-40">
<ul class="tiny h-Nav">
<!-- <li><a href="api" title="Neocities API">API</a></li> -->
<li><a href="terms" title="Neocities Terms of Use" rel="nofollow">Terms</a></li>
<li><a href="privacy" title="Neocities Privacy Policy" rel="nofollow">Privacy</a></li>
<li><a href="contact" title="Contact Us" rel="nofollow">Contact</a></li>
</ul>
</nav>
</div>
</div>
</aside>
<%= erb :'_footer', layout: false %>
</footer>
</div> <!-- end .page -->

View file

@ -51,4 +51,5 @@ html
ga('create', 'UA-41925541-1', 'neocities.org');
ga('send', 'pageview');
== erb :'_int-footer', layout: false
footer class="footer-Base"
== erb :'_footer', layout: false