##// END OF EJS Templates
DATABASES » madrigal
RSS
Add BASE_URL in settings to work with proxys
jespinoza -
r18:5a8055e18e7b
parent child
Show More
Show file before | Show file after | Hide comments
@@ -4,6 +4,7 from django.shortcuts import render
4 from apps.updata.forms import UpdataForm, ExpForm
4 from apps.updata.forms import UpdataForm, ExpForm
5 from django.core.files.storage import FileSystemStorage
5 from django.core.files.storage import FileSystemStorage
6 from django.contrib import messages
6 from django.contrib import messages
7 from django.conf import settings
7
8
8 import os
9 import os
9 import glob
10 import glob
@@ -14,7 +15,7 import madrigal.metadata
14 import madrigal.ui.web
15 import madrigal.ui.web
15 import madrigal.admin
16 import madrigal.admin
16
17
17 @login_required(login_url='/madrigal/accounts/login/')
18 @login_required(login_url='/{}/accounts/login/'.format(settings.BASE_URL))
18 def index(request):
19 def index(request):
19 '''
20 '''
20 Uploading experiments data view. Allows user to upload experiment files
21 Uploading experiments data view. Allows user to upload experiment files
Show file before | Show file after | Hide comments
@@ -131,6 +131,8 MEDIA_URL = '/media/'
131 # Example: "http://media.lawrence.com/static/"
131 # Example: "http://media.lawrence.com/static/"
132 STATIC_URL = '/madrigal/static/'
132 STATIC_URL = '/madrigal/static/'
133 STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
133 STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
134 BASE_URL = 'madrigal'
135 #BASE_URL = 'observatorios/radio-observatorio-jicamarca/madrigal'
134
136
135 BOOTSTRAP3 = {
137 BOOTSTRAP3 = {
136 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
138 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
Show file before | Show file after | Hide comments
@@ -1,12 +1,18
1 from django.conf.urls import include, url
1 from django.conf.urls import include, url
2 from django.contrib import admin
2 from django.contrib import admin
3 from django.conf import settings
3 import madweb.views
4 import madweb.views
4
5
6 if settings.BASE_URL:
7 base = settings.BASE_URL + '/'
8 else:
9 base = ''
10
5 urlpatterns = [
11 urlpatterns = [
6 url(r'^madrigal/', include('madweb.urls')),
12 url(r'^{}'.format(base), include('madweb.urls')),
7 url(r'^$', madweb.views.index),
13 # url(r'^$', madweb.views.index),
8 url(r'^madrigal/updata/', include('apps.updata.urls', namespace="updata")),
14 url(r'^{}updata/'.format(base), include('apps.updata.urls', namespace="updata")),
9 url(r'^madrigal/accounts/', include('apps.login.urls', namespace="login")),
15 url(r'^{}accounts/'.format(base), include('apps.login.urls', namespace="login")),
10 url(r'^madrigal/admin/', admin.site.urls),
16 url(r'^{}admin/'.format(base), admin.site.urls),
11 # url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
17 # url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
12 ]
18 ]
General Comments 0
You need to be logged in to leave comments. Login now