diff options
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/propose_workshop.html | 6 | ||||
| -rw-r--r-- | workshop_app/templates/workshop_app/registration/register.html | 3 | ||||
| -rw-r--r-- | workshop_portal/settings.py | 36 |
4 files changed, 20 insertions, 27 deletions
diff --git a/requirements.txt b/requirements.txt index bc6ced6..47b970d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==3.0.5 -django-recurrence==1.4.1 +django-recurrence==1.10.2 packaging==16.8 python-dateutil==2.6.0 pytz==2016.10 diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index 586ea8e..0f02c34 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -4,11 +4,13 @@ Propose a workshop {% endblock %} -{% block extra %} +{% block extra-dependencies %} <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <script src="https://code.jquery.com/jquery-1.12.4.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script> +{% endblock %} +{% block extra-custom-scripts %} <script> var dateToday = new Date(); var upto = new Date(); @@ -68,4 +70,4 @@ <br> </div> -{% endblock %} +{% endblock %}
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html index 2d154f6..cd716f4 100644 --- a/workshop_app/templates/workshop_app/registration/register.html +++ b/workshop_app/templates/workshop_app/registration/register.html @@ -30,9 +30,6 @@ <button class="btn btn-primary" type="submit">Register</button> </form><br> <!-- Activate when Instructor registeration starts --> - <!-- <div class="alert alert-info"> - <strong>Info!</strong> Instructors, please wait for our admin approval, if your instructor account is not activated in 7 days, please mail us at workshops[at]fossee[dot]in - </div> --> <br> </div> {% endblock %} diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py index 46dc9b7..f1805d2 100644 --- a/workshop_portal/settings.py +++ b/workshop_portal/settings.py @@ -13,17 +13,17 @@ https://docs.djangoproject.com/en/1.10/ref/settings/ import os import sys from local_settings import ( - EMAIL_HOST, - EMAIL_PORT, - EMAIL_HOST_USER, - EMAIL_HOST_PASSWORD, - EMAIL_USE_TLS, - SENDER_EMAIL - ) + EMAIL_HOST, + EMAIL_PORT, + EMAIL_HOST_USER, + EMAIL_HOST_PASSWORD, + EMAIL_USE_TLS, + SENDER_EMAIL +) + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ @@ -35,7 +35,6 @@ DEBUG = True ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ @@ -51,15 +50,13 @@ INSTALLED_APPS = [ 'teams', ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - ] ROOT_URLCONF = 'workshop_portal.urls' @@ -85,15 +82,14 @@ WSGI_APPLICATION = 'workshop_portal.wsgi.application' # Database # https://docs.djangoproject.com/en/1.10/ref/settings/#databases DATABASES = { - 'default': { + 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), 'TEST': { 'NAME': 'mytestdatabase', }, - } } - +} # Password validation # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators @@ -113,7 +109,6 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] - # Internationalization # https://docs.djangoproject.com/en/1.10/topics/i18n/ @@ -127,7 +122,6 @@ USE_L10N = True USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.10/howto/static-files/ @@ -143,7 +137,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "workshop_app", "data") LOG_FOLDER = os.path.join(BASE_DIR, "workshop_app", "logs") -#Email Connection Settings +# Email Connection Settings EMAIL_HOST = EMAIL_HOST EMAIL_HOST_USER = EMAIL_HOST_USER EMAIL_HOST_PASSWORD = EMAIL_HOST_PASSWORD @@ -154,12 +148,12 @@ SENDER_EMAIL = SENDER_EMAIL EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -#Change this to the production url -PRODUCTION_URL = 'your_production_url' +# Change this to the production url +PRODUCTION_URL = 'http://localhost:8000' ADMIN_EMAIL = 'your admin email' -#Set True or False to view/hide +# Set True or False to view/hide SHOW_WORKSHOP_STATS = True LOGIN_REDIRECT_URL = '/profile' |