summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayaram R Pai2014-09-21 13:15:37 +0530
committerJayaram R Pai2014-09-21 13:15:37 +0530
commitf2ca0b3324dbfb5fd180f0f2c46dc6f36c786292 (patch)
tree5eeb5e21849dfb6e911fc024433b86f37deb2f56
parent96156a0b7f59372dfa22710a45e1443af71bb8fb (diff)
downloadscipy2014-f2ca0b3324dbfb5fd180f0f2c46dc6f36c786292.tar.gz
scipy2014-f2ca0b3324dbfb5fd180f0f2c46dc6f36c786292.tar.bz2
scipy2014-f2ca0b3324dbfb5fd180f0f2c46dc6f36c786292.zip
fixed /2014 redirects
-rw-r--r--scipy/urls.py3
-rw-r--r--static/dajax/jquery.dajax.core.js2
-rw-r--r--static/dajaxice/dajaxice.core.js2
-rw-r--r--website/views.py4
4 files changed, 7 insertions, 4 deletions
diff --git a/scipy/urls.py b/scipy/urls.py
index 3e64f3a..14eb39b 100644
--- a/scipy/urls.py
+++ b/scipy/urls.py
@@ -9,4 +9,7 @@ urlpatterns = patterns('',
# Dajaxice urls
url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
+
+ # For devel
+ # url(r'^2014/', include('website.urls', namespace='website')),
)
diff --git a/static/dajax/jquery.dajax.core.js b/static/dajax/jquery.dajax.core.js
index 0effc38..0bddd41 100644
--- a/static/dajax/jquery.dajax.core.js
+++ b/static/dajax/jquery.dajax.core.js
@@ -46,7 +46,7 @@ var Dajax = {
break;
case 'red':
- window.setTimeout('window.location="'+elem.url+'";',elem.delay);
+ window.setTimeout('window.location="/2014/'+elem.url+'";',elem.delay);
break;
case 'js':
diff --git a/static/dajaxice/dajaxice.core.js b/static/dajaxice/dajaxice.core.js
index a03e97f..e879d45 100644
--- a/static/dajaxice/dajaxice.core.js
+++ b/static/dajaxice/dajaxice.core.js
@@ -65,7 +65,7 @@ var Dajaxice = {
var send_data = 'argv='+encodeURIComponent(JSON.stringify(argv)),
oXMLHttpRequest = new XMLHttpRequest,
- endpoint = '/dajaxice/'+dajaxice_function+'/';
+ endpoint = '/2014/dajaxice/'+dajaxice_function+'/';
if(method == 'GET'){
endpoint = endpoint + '?' + send_data;
diff --git a/website/views.py b/website/views.py
index 06ee8d8..7c1bf98 100644
--- a/website/views.py
+++ b/website/views.py
@@ -44,7 +44,7 @@ def call_for_proposals(request, action=None):
data = form.save(commit=False)
data.user = request.user
data.save()
- return HttpResponseRedirect('/call-for-proposals')
+ return HttpResponseRedirect('/2014/call-for-proposals')
else:
context['proposal_form'] = form
context['edit'] = True
@@ -56,7 +56,7 @@ def call_for_proposals(request, action=None):
context['edit'] = True
return render(request, 'website/templates/call-for-proposals.html', context)
else:
- return HttpResponseRedirect('/call-for-proposals')
+ return HttpResponseRedirect('/2014/call-for-proposals')
# GET
""" NEW PROPOSAL SECTION """