renamed 'relearn' folder into 'ethertoff'

README.md

@@ -51,7 +51,7 @@ First create and install a virtual environment [1]. Then:
     # Or use cloning over ssh (requires account):
     # git@gitlab.constantvzw.org:osp/tools.ethertoff.git
     cd tools.ethertoff      # [2]
-    cd relearn
+    cd ethertoff
     cp local_settings.py.example local_settings.py
     # Change database details in local_settings.py
     cd ..
@@ -120,23 +120,19 @@ to the group you just created
 Go back to the admin home, and then create an Etherpad Group based upon the group and the server you just created.
     Etherpadlite > Groups > Add
     
-Now relearn is served at http://127.0.0.1:8000/ locally, or on your domain
+Now Ethertoff is served at http://127.0.0.1:8000/ locally, or on your domain
 name on a server.
 
 You can set the site name, that appears on the header, in the ‘sites’ app in the admin.
 
 - - -
 
-[1] Something like:
+[^1]: Something like:
 
     mkdir -p ~/venvs/
     cd ~/venvs/
-    virtualenv relearn
-    source ~/venvs/relearn/bin/activate
-
-[2] For those running the Virtual Machine from the relearn summer school:
-
-    cd ~/relearn/relearn.be/
+    virtualenv ethertoff
+    source ~/venvs/ethertoff/bin/activate
 
 - - -
 
@@ -173,10 +169,10 @@ folder /static/.
     pip install gunicorn
     cd /etc/nginx/sites-available/
     # (edit nginx config file)
-    sudo vim relearn/
+    sudo vim ethertoff.conf
     cd ../sites-enabled/
-    sudo ln -s ../sites-available/relearn
-    cd relearn_directory/
+    sudo ln -s ../sites-available/ethertoff
+    cd ethertoff_directory/
     # (edit gunicorn config file)
     vim run.sh 
     chmod +x run.sh

etherpadlite/models.py

@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from py_etherpad import EtherpadLiteClient
 
-from relearn.templatetags.wikify import dewikify
+from ethertoff.templatetags.wikify import dewikify
 
 import string
 import random
@@ -174,7 +174,7 @@ class Pad(models.Model):
         return self.display_slug
 
     def get_absolute_url(self):
-        return reverse('relearn.views.xhtml', args=[self.display_slug.replace('.md','')])
+        return reverse('ethertoff.views.xhtml', args=[self.display_slug.replace('.md','')])
 
     @property
     def padid(self):

relearn/context_processors.py → ethertoff/context_processors.py

@@ -4,7 +4,7 @@ import sys
 
 from datetime import datetime
 
-from relearn.settings import MEDIA_ROOT
+from ethertoff.settings import MEDIA_ROOT
 from etherpadlite.models import Pad, PadAuthor, PadServer
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.sites.models import get_current_site

relearn/local_settings.py.example → ethertoff/local_settings.py.example

@@ -33,5 +33,5 @@ MEDIA_ROOT = ''
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/var/www/example.com/static/"
-STATIC_ROOT = '/home/osp/static-relearn-collected/'
+STATIC_ROOT = '/home/osp/static-ethertoff-collected/'
 

relearn/management/commands/backup.py → ethertoff/management/commands/backup.py

@@ -18,7 +18,7 @@ from django.core.management.base import BaseCommand, CommandError
 # Django Apps import
 
 from etherpadlite.models import Pad, PadAuthor
-from relearn.settings import BACKUP_DIR
+from ethertoff.settings import BACKUP_DIR
 
 class Command(BaseCommand):
     args = ''

relearn/management/commands/index.py → ethertoff/management/commands/index.py

@@ -23,7 +23,7 @@ from django.template.loader import render_to_string
 
 from django.contrib.sites.models import Site
 from etherpadlite.models import Pad, PadAuthor
-from relearn.settings import BACKUP_DIR
+from ethertoff.settings import BACKUP_DIR
 
 """
 We scrape all the pages, construct a graph, and ask the RDF store to return us all the metadata.

relearn/middleware.py → ethertoff/middleware.py

@@ -2,7 +2,7 @@ from django.http import HttpResponseServerError
 from django.template import Context, Template, loader
 
 from urllib2 import URLError
-from relearn.context_processors import EthertoffError
+from ethertoff.context_processors import EthertoffError
 from etherpadlite.models import Pad, PadAuthor, PadServer
 
 from html5lib import HTMLParser, serializer, treebuilders, treewalkers

relearn/settings.py → ethertoff/settings.py

-# Django settings for relearn project.
+# Django settings for ethertoff project.
 import os
 import django.conf.global_settings as DEFAULT_SETTINGS
 
@@ -78,9 +78,9 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-    'relearn.middleware.ErrorHandlingMiddleware',
+    'ethertoff.middleware.ErrorHandlingMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'relearn.middleware.TidyMiddleware',
+    'ethertoff.middleware.TidyMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -89,22 +89,22 @@ MIDDLEWARE_CLASSES = (
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'relearn.urls'
+ROOT_URLCONF = 'ethertoff.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'relearn.wsgi.application'
+WSGI_APPLICATION = 'ethertoff.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(PROJECT_DIR, 'relearn/templates'),
+    os.path.join(PROJECT_DIR, 'ethertoff/templates'),
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
-    "relearn.context_processors.site_name",
-    "relearn.context_processors.pads",
-    "relearn.context_processors.local",
+    "ethertoff.context_processors.site_name",
+    "ethertoff.context_processors.pads",
+    "ethertoff.context_processors.local",
 )
 
 INSTALLED_APPS = (
@@ -120,7 +120,7 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'etherpadlite',
     'example_theme',
-    'relearn',
+    'ethertoff',
     'south'
 )