diff --git a/README.md b/README.md index 00cfa19a..180c16d7 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,53 @@ [![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! \ No newline at end of file +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 +``` \ No newline at end of file diff --git a/views/_footer.erb b/views/_footer.erb new file mode 100644 index 00000000..a791f2d1 --- /dev/null +++ b/views/_footer.erb @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/views/_int-footer.erb b/views/_int-footer.erb deleted file mode 100644 index 69a4ec74..00000000 --- a/views/_int-footer.erb +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/views/browse.erb b/views/browse.erb index 48267ff6..871e8755 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -44,7 +44,7 @@ <% @sites.each do |site| %>
  • - + <%= site.username %> diff --git a/views/index.erb b/views/index.erb index 398b3929..0334b143 100644 --- a/views/index.erb +++ b/views/index.erb @@ -279,8 +279,8 @@ - diff --git a/views/index.slim b/views/index.slim deleted file mode 100644 index a07e5b69..00000000 --- a/views/index.slim +++ /dev/null @@ -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: Sign In - .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,
    help us by contributing! - -.row - .span6.offset3 - h4 style="line-height: 22pt" There are #{Server.first.slots_available} web site spaces remaining.
    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 diff --git a/views/layout.erb b/views/layout.erb index a5411d9f..c91df57e 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -60,25 +60,7 @@ diff --git a/views/layout.slim b/views/layout.slim index 7bbf8382..ea39cd80 100644 --- a/views/layout.slim +++ b/views/layout.slim @@ -50,5 +50,6 @@ html ga('create', 'UA-41925541-1', 'neocities.org'); ga('send', 'pageview'); - - == erb :'_int-footer', layout: false + + footer class="footer-Base" + == erb :'_footer', layout: false