From 0292d11d740e28c7bbe435a0fbaf3ab9bacf04e7 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 6 Aug 2015 23:26:16 +0200 Subject: [PATCH 1/2] Add a README.rst file so that folks know how to get set up to build the website. --- README.rst | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 README.rst diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..5f3761d --- /dev/null +++ b/README.rst @@ -0,0 +1,46 @@ +============== +OpenLP Website +============== + +This repository holds the OpenLP website, so that anyone can contribute to the site. + +The website is built using Nikola, the static site generator. It uses Disqus for comments, which has superior +spam detection and moderation tools. The instructions below show you how to get set up on your local machine. + +Installing Nikola +----------------- +The OpenLP site is built on **Nikola** 7.6.x. This means you'll probably need to install it in a virtual environment. +Not to worry, this is pretty simple. + +First up, install the ``python-virtualenv`` package:: + + $ sudo apt-get install python-virtualenv + +Now create a virtual environment somewhere. I usually put it in the same directory as my Bazaar repositories:: + + $ virtualenv venv + +Once that has been created, you can install Nikola with ``pip``:: + + $ cd venv/bin + $ ./pip install --upgrade nikola + +*Note: I'm using ``--upgrade`` to make sure that I install the latest version of Nikola, so that even if I have a version of Nikola installed, I'll have the latest and greatest here.* + +I like to symlink the ``nikola`` binary into the project directory I'm working in, for ease of use:: + + $ cd ~/projects/openlp/website + $ ln -s ~/venv/bin/nikola nikola + +Now you're ready to start working on the web site. Next step is to build the site:: + + $ nikola build + +That will run through a whole bunch of stuff and build the site for you. To run the site, simply use the ``serve`` +command:: + + $ nikola serve + +This will start a local Python web server and tell you where to go in your browser in order to preview the site. + +Once you're this far, you'll be ready to start contributing toward the we site. Have fun! From 3c8fb14ed190f85b6ded46d1c646e57273b4370b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 6 Aug 2015 23:41:40 +0200 Subject: [PATCH 2/2] Fix a missing testimonial author; Fix a warning while building --- conf.py | 2 ++ themes/openlp2v2/templates/front_page.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 004b92f..c648216 100644 --- a/conf.py +++ b/conf.py @@ -265,6 +265,8 @@ URL_TYPE = 'full_path' # often removed or replaced as well. # SLUG_TAG_PATH = True +WRITE_TAG_CLOUD = False + # A list of redirection tuples, [("foo/from.html", "/bar/to.html")]. # # A HTML file will be created in output/foo/from.html that redirects diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html index 06b0156..3dd4d35 100644 --- a/themes/openlp2v2/templates/front_page.html +++ b/themes/openlp2v2/templates/front_page.html @@ -359,7 +359,7 @@

Great Product!

Sunday morning I set the up projector, gave a 10 minute lesson to the young lady who does our overheads. Everything went smoothly. She was so excited, the congregation thought it was great, our priest was ecstatic.

-
Someone famous in Source Title
+