Merge pull request #1266 from PyBossa/migrate-to-sass-cosmetic

💄 changes

.travis.yml

@@ -3,13 +3,17 @@ dist: trusty
 language: python
 python:
 - '2.7'
+# git submodules workaround
+git:
+  submodules: false
 env:
 - PYBOSSA_SETTINGS='../settings_test.py' PYBOSSA_REDIS_CACHE_DISABLED='1'
 services:
 - redis-server
 addons:
   postgresql: "9.3"
 before_install:
+- git submodule update --init --recursive
 - sudo apt-get update -y && sudo apt-get install -y swig libffi-dev
 - redis-server --version
 - redis-server contrib/redis/sentinel.conf --sentinel
@@ -20,7 +24,7 @@ install:
 before_script:
 - psql -c "create user rtester with createdb login password 'rtester'" -U postgres
 - psql -c "create database pybossa_test owner rtester encoding 'UTF-8' lc_collate 'en_US.UTF-8' lc_ctype 'en_US.UTF-8' template template0;" -U postgres
-script: 
+script:
     - alembic -c alembictest.ini stamp head
     - alembic -c alembictest.ini upgrade head
     - nosetests test/

doc/Makefile

@@ -47,6 +47,9 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
+livehtml:
+	sphinx-autobuild -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo

doc/README.md

@@ -1,9 +1,15 @@
 PyBossa Sphinx Docs Creation
 ============================
 
-To create and preview docs:
+To create and preview docs (once):
 
 1. Activate virtualenv from PyBossa: `source ../env/bin/activate`.
 2. Build docs with `make html`
 3. Open with your browser of choice `./_build/html/index.html` or open a local webserver in `./_build/html/`
 
+To create and preview docs on every file change:
+
+1. Activate virtualenv from PyBossa: `source ../env/bin/activate`.
+2. Install sphinx-autobuild: `pip install sphinx-autobuild`
+3. Run `make livehtml`
+4. Open Browser on [http://127.0.0.1:8000](http://127.0.0.1:8000)

doc/admin.rst

@@ -9,15 +9,17 @@ administrator and manage the site with full privileges.
 And admin user will be able to access the admin page by clicking in the user
 name and then in the link *Admin site*.
 
-.. image:: http://i.imgur.com/Xm6c42x.png
+.. image:: http://i.imgur.com/5YWAJ8E.png
 
-Administrators can manage three different areas of the server:
+Administrators can manage different areas of the server:
 
- 1. Featured projects
- 2. Categories, and
- 3. Administrators
+ 1. Background jobs
+ 2. Featured projects
+ 3. Categories
+ 4. Administrators
+ 5. Users
 
-.. image:: http://i.imgur.com/CIVyRak.png
+.. image:: http://i.imgur.com/cfUF6K2.png
     :width:100%
 
 .. note::
@@ -26,7 +28,7 @@ Administrators can manage three different areas of the server:
     a :ref:`task-presenter` to allow other volunteers to participate.
 
 .. note::
-    A fourth option is available on the Admin Site menu. Here, admins will be able
+    In the users option, admins will be able
     to obtain a list of all registered users in the PyBossa system, in either
     json or csv formats.
 
@@ -41,13 +43,12 @@ Featured Projects
 =================
 
 In this section, admins can add/remove projects to the front page of the
-site. 
+site.
 
-.. image:: http://i.imgur.com/Jpr3bGh.png
+.. image:: http://i.imgur.com/K9deWZo.png
     :width:100%
 
-Basically, you will see a green button to add a project to the Featured
-selection, or a red one to remove it from the front page.
+You will see a "Add to Featured" link to add a a project to featured front page or a "Remove from Featured" to remove it.
 
 
 .. _categories:
@@ -67,7 +68,7 @@ description and click in the green button labeled: Add category.
 
 .. _EpiCollect: http://plus.epicollect.net
 
-.. image:: http://i.imgur.com/otR6wcG.png
+.. image:: http://i.imgur.com/FlTowJ7.png
     :width: 100%
 
 .. note::
@@ -85,7 +86,7 @@ In this section an administrator will be able to add/remove users to the admin
 role. Basically, you can search by user name -nick name- and add them to the
 admin group.
 
-.. image:: http://i.imgur.com/IdDKo8P.png
+.. image:: http://i.imgur.com/WSwNFxy.png
     :width:100%
 
 As with the :ref:`categories` section, a green button will allow you to add the user
@@ -100,7 +101,7 @@ When a project is created, deleted or updated, the system registers its actions
 in the server. Admins will have access to all the logged actions in every
 project page, in a section named **Audit log**.
 
-.. image:: http://i.imgur.com/UQeyHPF.png
+.. image:: http://i.imgur.com/BjcJQW7.png
     :width: 100%
 
 The section will let you know the following information:
@@ -121,7 +122,7 @@ Dashboard
 
 The dashboard allows you to see what's going on in your PyBossa server.
 
-.. image:: http://i.imgur.com/CpgclS1.png
+.. image:: http://i.imgur.com/TmB0dx2.png
 
 .. note::
     This feature requires PostgreSQL >= 9.3. Please upgrade as soon as possible your

doc/changelog/index.rst

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* v2.0.0_
 * v1.6.2_
 * v1.6.1_
 * v1.6.0_
@@ -18,6 +19,7 @@ Changelog
 * v1.1.0_
 * v0.2.3_
 
+.. _v2.0.0: v2.0.0.html
 .. _v1.6.2: v1.6.2.html
 .. _v1.6.1: v1.6.1.html
 .. _v1.6.0: v1.6.0.html

doc/changelog/v2.0.0.rst

@@ -0,0 +1,6 @@
+================
+Changelog v2.0.0
+================
+
+ * Brand new theme with lots of small fixes.
+ * Support of different aspect ratios for avatars.

doc/customizing.rst

@@ -258,6 +258,7 @@ use.
 .. _TERMSOFUSE: https://github.com/PyBossa/pybossa/blob/master/settings_local.py.tmpl#L43
 .. _DATEUSE: https://github.com/PyBossa/pybossa/blob/master/settings_local.py.tmpl#L44
 
+.. _ssnn:
 
 Enabling Twitter, Facebook and Google authentication
 ====================================================