Remove `/edraak` prefix from URLs

lms/djangoapps/edraak_contact/urls.py

@@ -3,5 +3,5 @@ from django.conf.urls import patterns, url
 from django.core.urlresolvers import LocaleRegexURLResolver
 
 urlpatterns = patterns('',
-        url(r'^contact$', 'edraak_contact.views.contact', name="edraak_contact"),
+        url(r'^contact_send$', 'edraak_contact.views.contact', name="edraak_contact_send"),
 )

lms/djangoapps/edraak_contact/views.py

@@ -10,11 +10,12 @@ from util.json_request import JsonResponse
 
 log = logging.getLogger(__name__)
 
+
 @ensure_csrf_cookie
 def contact(request):
     if request.method == 'POST':
         if not (request.POST['firstname'] or request.POST['lastname'] or request.POST['email'] or request.POST['message']):
-            return render_to_response("theme-contact.html", {'error': True})
+            return render_to_response("static_templates/theme-contact.html", {'error': True})
 
 
         ##################################### We will need this #####################################
@@ -43,10 +44,10 @@ def contact(request):
         #             result = True                                                                 #
         #         else:                                                                             #
         #             params = {'error': True, 'captcha': True}                                     #
-        #             return render_to_response("theme-contact.html", params)                       #
+        #             return render_to_response("static_templates/theme-contact.html", params)      #
         # except:                                                                                   #
         #     # should return a google error                                                        #
-        #     return render_to_response("theme-contact.html", {'error': True})                      #
+        #     return render_to_response("static_templates/theme-contact.html", {'error': True})     #
         ###################################### Do NOT Delete ########################################
 
 
@@ -98,5 +99,5 @@ def contact(request):
             # Seems like the core part of the request was successful.
             return JsonResponse(js, status=500)
 
-        return render_to_response("contact/contact.html", {'success': True})
-    return render_to_response("contact/contact.html", {})
+        return render_to_response("static_templates/theme-contact.html", {'success': True})
+    return render_to_response("static_templates/theme-contact.html", {})

lms/djangoapps/edraak_misc/urls.py

@@ -16,7 +16,7 @@ def i18n_patterns(prefix, *args):
 
 
 urlpatterns = patterns('',
-    url(r'^setlang/$', 'edraak_misc.views.set_language', name='edraak_setlang'),
+    url(r'^changelang/$', 'edraak_misc.views.set_language', name='edraak_setlang'),
     url(r'^check_student_grades/$', 'edraak_misc.views.check_student_grades', name='edraak_check_student_grades'),
     url(r'^all_courses/$', 'edraak_misc.views.all_courses', name='edraak_all_courses'),
 )

lms/templates/contact/contact.html

-<%!
-    import logging
-    log = logging.getLogger(__name__)
-    log.error('Edraak theme is required for this module to work. Please use Edraak theme.')
-%>
-## Just an empty placeholder
-## Actual implementation is available in Edraak theme

lms/urls.py

@@ -68,8 +68,8 @@ urlpatterns = ('',  # nopep8
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
 
-    url(r'^edraak/', include('edraak_misc.urls')),
-    url(r'^edraak/', include('edraak_contact.urls')),
+    url(r'', include('edraak_misc.urls')),
+    url(r'', include('edraak_contact.urls')),
     url(r'', include('edraak_bayt.urls')),
 
     url(r'^embargo$', 'student.views.embargo', name="embargo"),