[0-9]+)?$', 'simplewiki.views.revision_feed', name='wiki_revision_feed'),
+ url(r'^search' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_search_articles'),
+ url(r'^list' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_list_articles'), # Just an alias for the search, but you usually don't submit a search term
)
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index df81c1e3a9..fade92f612 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -88,6 +88,8 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '')
CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
+ZENDESK_URL = ENV_TOKENS.get("ZENDESK_URL")
+FEEDBACK_SUBMISSION_EMAIL = ENV_TOKENS.get("FEEDBACK_SUBMISSION_EMAIL")
############################## SECURE AUTH ITEMS ###############
# Secret things: passwords, access keys, etc.
@@ -123,3 +125,6 @@ DATADOG_API = AUTH_TOKENS.get("DATADOG_API")
# Analytics dashboard server
ANALYTICS_SERVER_URL = ENV_TOKENS.get("ANALYTICS_SERVER_URL")
ANALYTICS_API_KEY = AUTH_TOKENS.get("ANALYTICS_API_KEY", "")
+
+ZENDESK_USER = AUTH_TOKENS.get("ZENDESK_USER")
+ZENDESK_API_KEY = AUTH_TOKENS.get("ZENDESK_API_KEY")
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 32a213f06e..b804ae2a7a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -90,7 +90,10 @@ MITX_FEATURES = {
# Give a UI to show a student's submission history in a problem by the
# Staff Debug tool.
- 'ENABLE_STUDENT_HISTORY_VIEW': True
+ 'ENABLE_STUDENT_HISTORY_VIEW': True,
+
+ # Provide a UI to allow users to submit feedback from the LMS
+ 'ENABLE_FEEDBACK_SUBMISSION': False,
}
# Used for A/B testing
@@ -323,6 +326,14 @@ WIKI_LINK_DEFAULT_LEVEL = 2
PEARSONVUE_SIGNINPAGE_URL = "https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX"
# TESTCENTER_ACCOMMODATION_REQUEST_EMAIL = "exam-help@edx.org"
+##### Feedback submission mechanism #####
+FEEDBACK_SUBMISSION_EMAIL = None
+
+##### Zendesk #####
+ZENDESK_URL = None
+ZENDESK_USER = None
+ZENDESK_API_KEY = None
+
################################# open ended grading config #####################
#By setting up the default settings with an incorrect user name and password,
@@ -582,3 +593,4 @@ INSTALLED_APPS = (
# Discussion forums
'django_comment_client',
)
+
diff --git a/lms/static/images/university/epfl/epfl-cover.jpg b/lms/static/images/university/epfl/epfl-cover.jpg
index 42b188c925..e585966e7b 100644
Binary files a/lms/static/images/university/epfl/epfl-cover.jpg and b/lms/static/images/university/epfl/epfl-cover.jpg differ
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index ca56f542d6..d2d4a0564f 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -202,5 +202,62 @@ mark {
}
}
+.help-tab {
+ @include transform(rotate(-90deg));
+ @include transform-origin(0 0);
+ top: 50%;
+ left: 0;
+ position: fixed;
+ z-index: 99;
+ a:link, a:visited {
+ cursor: pointer;
+ border: 1px solid #ccc;
+ border-top-style: none;
+ @include border-radius(0px 0px 10px 10px);
+ background: transparentize(#fff, 0.25);
+ color: transparentize(#333, 0.25);
+ font-weight: bold;
+ text-decoration: none;
+ padding: 6px 22px 11px;
+ display: inline-block;
+ &:hover {
+ color: #fff;
+ background: #1D9DD9;
+ }
+ }
+}
+
+.help-buttons {
+ padding: 10px 50px;
+
+ a:link, a:visited {
+ padding: 15px 0px;
+ text-align: center;
+ cursor: pointer;
+ background: #fff;
+ text-decoration: none;
+ display: block;
+ border: 1px solid #ccc;
+
+ &#feedback_link_problem {
+ border-bottom-style: none;
+ @include border-radius(10px 10px 0px 0px);
+ }
+
+ &#feedback_link_question {
+ border-top-style: none;
+ @include border-radius(0px 0px 10px 10px);
+ }
+
+ &:hover {
+ color: #fff;
+ background: #1D9DD9;
+ }
+ }
+}
+
+#feedback_form textarea[name="details"] {
+ height: 150px;
+}
diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss
index 2bd0dd18c8..8ff58c1c14 100644
--- a/lms/static/sass/shared/_modal.scss
+++ b/lms/static/sass/shared/_modal.scss
@@ -155,7 +155,7 @@
display: block;
color: #8F0E0E;
- + input {
+ + input, + textarea {
border: 1px solid #CA1111;
color: #8F0E0E;
}
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
new file mode 100644
index 0000000000..83ea00068f
--- /dev/null
+++ b/lms/templates/help_modal.html
@@ -0,0 +1,167 @@
+<%namespace name='static' file='static_content.html'/>
+<%! from django.conf import settings %>
+<%! from courseware.tabs import get_discussion_link %>
+
+% if settings.MITX_FEATURES.get('ENABLE_FEEDBACK_SUBMISSION', False):
+
+
+
+
+
+
+
+<%
+discussion_link = get_discussion_link(course) if course else None
+%>
+% if discussion_link:
+
+ Have a course-specific question?
+
+ Post it on the course forums.
+
+
+
+% endif
+
+
Have a general question about edX? Check the FAQ.
+
+
+
+
+## TODO: find a way to refactor this
+
+
+
+
+
+ Thanks for your feedback. We will read your message, and our
+ support team may contact you to respond or ask for further clarification.
+
+
+
+
EPFL is one of the two Swiss Federal Institutes of Technology. With the status of a national school since 1969, the young engineering school has grown in many dimensions, to the extent of becoming one of the most famous European institutions of science and technology. It has three core missions: training, research and technology transfer.
- EPFL is located in Lausanne in Switzerland, on the shores of the largest lake in Europe, Lake Geneva and at the foot of the Alps and Mont-Blanc. Its main campus brings together over 11,000 persons, students, researchers and staff in the same magical place. Because of its dynamism and rich student community, EPFL has been able to create a special spirit imbued with curiosity and simplicity. Daily interactions amongst students, researchers and entrepreneurs on campus give rise to new scientific, technological and architectural projects.
-
+EPFL is the Swiss Federal Institute of Technology in Lausanne. The past decade has seen EPFL ascend to the very top of European institutions of science and technology: it is ranked #1 in Europe in the field of engineering by the Times Higher Education (based on publications and citations), Leiden Rankings, and the Academic Ranking of World Universities.
+
+EPFL's main campus brings together 12,600 students, faculty, researchers, and staff in a high-energy, dynamic learning and research environment. It directs the Human Brain Project, an undertaking to simulate the entire human brain using supercomputers, in order to gain new insights into how it operates and to better diagnose brain disorders. The university is building Solar Impulse, a long-range solar-powered plane that aims to be the first piloted fixed-wing aircraft to circumnavigate the Earth using only solar power. EPFL was part of the Alinghi project, developing advanced racing boats that won the America's Cup multiple times. The university operates, for education and research purposes, a Tokamak nuclear fusion reactor. EPFL also houses the Musée Bolo museum and hosts several music festivals, including Balelec, that draws over 15,000 guests every year.
+
+EPFL is a major force in entrepreneurship, with 2012 bringing in $100M in funding for ten EPFL startups. Both young spin-offs (like Typesafe and Pix4D) and companies that have long grown past the startup stage (like Logitech) actively transfer the results of EPFL's scientific innovation to industry.
+
${parent.body()}
diff --git a/lms/urls.py b/lms/urls.py
index 082004c1be..b00813a40d 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -2,7 +2,6 @@ from django.conf import settings
from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.conf.urls.static import static
-from django.views.generic import RedirectView
from . import one_time_startup
@@ -10,10 +9,9 @@ import django.contrib.auth.views
# Uncomment the next two lines to enable the admin:
if settings.DEBUG:
- from django.contrib import admin
admin.autodiscover()
-urlpatterns = ('',
+urlpatterns = ('', # nopep8
# certificate view
url(r'^update_certificate$', 'certificates.views.update_certificate'),
@@ -116,8 +114,9 @@ urlpatterns = ('',
# Favicon
(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
+ url(r'^submit_feedback$', 'util.views.submit_feedback_via_zendesk'),
+
# TODO: These urls no longer work. They need to be updated before they are re-enabled
- # url(r'^send_feedback$', 'util.views.send_feedback'),
# url(r'^reactivate/(?P[^/]*)$', 'student.views.reactivation_email'),
)
@@ -299,12 +298,12 @@ if settings.COURSEWARE_ENABLED:
'courseware.views.news', name="news"),
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/discussion/',
include('django_comment_client.urls'))
- )
+ )
urlpatterns += (
# This MUST be the last view in the courseware--it's a catch-all for custom tabs.
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/(?P[^/]+)/$',
'courseware.views.static_tab', name="static_tab"),
- )
+ )
if settings.MITX_FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'):
urlpatterns += (
@@ -346,13 +345,13 @@ if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'):
url(r'^migrate/reload/(?P[^/]+)/(?P[^/]+)$', 'lms_migration.migrate.manage_modulestores'),
url(r'^gitreload$', 'lms_migration.migrate.gitreload'),
url(r'^gitreload/(?P[^/]+)$', 'lms_migration.migrate.gitreload'),
- )
+ )
if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
urlpatterns += (
url(r'^event_logs$', 'track.views.view_tracking_log'),
url(r'^event_logs/(?P.+)$', 'track.views.view_tracking_log'),
- )
+ )
# FoldIt views
urlpatterns += (
diff --git a/pre-requirements.txt b/pre-requirements.txt
index 7ecead0ce7..d39199a741 100644
--- a/pre-requirements.txt
+++ b/pre-requirements.txt
@@ -1,2 +1,10 @@
+# We use `scipy` in our project, which relies on `numpy`. `pip` apparently
+# installs packages in a two-step process, where it will first try to build
+# all packages, and then try to install all packages. As a result, if we simply
+# added these packages to the top of `requirements.txt`, `pip` would try to
+# build `scipy` before `numpy` has been installed, and it would fail. By
+# separating this out into a `pre-requirements.txt` file, we can make sure
+# that `numpy` is built *and* installed before we try to build `scipy`.
+
numpy==1.6.2
distribute>=0.6.28