From e8ee29786fdfe2f39d780f0f64cc5592d19b0fb9 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 19 Jul 2013 12:04:12 -0400 Subject: [PATCH] Remove news carousel and other unused pages Remove unused course_filter page removes university_profile urls and templates removes all university_profile views remove news from templates/index --- cms/djangoapps/contentstore/views/requests.py | 3 +- common/djangoapps/student/views.py | 34 +------- lms/djangoapps/branding/views.py | 6 +- lms/djangoapps/courseware/views.py | 59 ++----------- lms/templates/course.html | 2 +- lms/templates/course_filter.html | 52 ------------ lms/templates/courseware/course_about.html | 12 +-- lms/templates/courseware/courses.html | 2 - lms/templates/dashboard.html | 85 ++----------------- lms/templates/index.html | 64 +++----------- lms/templates/university_profile/anux.html | 25 ------ lms/templates/university_profile/base.html | 30 ------- .../university_profile/berkeleyx.html | 25 ------ lms/templates/university_profile/delftx.html | 25 ------ lms/templates/university_profile/edge.html | 66 -------------- lms/templates/university_profile/epflx.html | 31 ------- .../university_profile/georgetownx.html | 25 ------ .../university_profile/harvardx.html | 26 ------ lms/templates/university_profile/mcgillx.html | 25 ------ lms/templates/university_profile/mitx.html | 27 ------ lms/templates/university_profile/ricex.html | 25 ------ .../university_profile/template.html | 25 ------ .../university_profile/torontox.html | 25 ------ .../university_profile/utaustinx.html | 24 ------ lms/templates/university_profile/utx.html | 29 ------- .../university_profile/wellesleyx.html | 25 ------ lms/urls.py | 26 ------ 27 files changed, 40 insertions(+), 763 deletions(-) delete mode 100644 lms/templates/course_filter.html delete mode 100644 lms/templates/university_profile/anux.html delete mode 100644 lms/templates/university_profile/base.html delete mode 100644 lms/templates/university_profile/berkeleyx.html delete mode 100644 lms/templates/university_profile/delftx.html delete mode 100644 lms/templates/university_profile/edge.html delete mode 100644 lms/templates/university_profile/epflx.html delete mode 100644 lms/templates/university_profile/georgetownx.html delete mode 100644 lms/templates/university_profile/harvardx.html delete mode 100644 lms/templates/university_profile/mcgillx.html delete mode 100644 lms/templates/university_profile/mitx.html delete mode 100644 lms/templates/university_profile/ricex.html delete mode 100644 lms/templates/university_profile/template.html delete mode 100644 lms/templates/university_profile/torontox.html delete mode 100644 lms/templates/university_profile/utaustinx.html delete mode 100644 lms/templates/university_profile/utx.html delete mode 100644 lms/templates/university_profile/wellesleyx.html diff --git a/cms/djangoapps/contentstore/views/requests.py b/cms/djangoapps/contentstore/views/requests.py index 8a05bf1258..abbf84755e 100644 --- a/cms/djangoapps/contentstore/views/requests.py +++ b/cms/djangoapps/contentstore/views/requests.py @@ -1,4 +1,5 @@ from django.http import HttpResponse +from django.shortcuts import redirect from mitxmako.shortcuts import render_to_string, render_to_response __all__ = ['edge', 'event', 'landing'] @@ -11,7 +12,7 @@ def landing(request, org, course, coursename): # points to the temporary edge page def edge(request): - return render_to_response('university_profiles/edge.html', {}) + return redirect('/') def event(request): diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 74b465f690..440dd4fbd3 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -90,10 +90,7 @@ def index(request, extra_context={}, user=None): courses = get_courses(None, domain=domain) courses = sort_by_announcement(courses) - # Get the 3 most recent news - top_news = _get_news(top=3) - - context = {'courses': courses, 'news': top_news} + context = {'courses': courses} context.update(extra_context) return render_to_response('index.html', context) @@ -285,9 +282,6 @@ def dashboard(request): exam_registrations = {course.id: exam_registration_info(request.user, course) for course in courses} - # Get the 3 most recent news - top_news = _get_news(top=3) if not settings.MITX_FEATURES.get('ENABLE_MKTG_SITE', False) else None - # get info w.r.t ExternalAuthMap external_auth_map = None try: @@ -302,7 +296,6 @@ def dashboard(request): 'errored_courses': errored_courses, 'show_courseware_links_for': show_courseware_links_for, 'cert_statuses': cert_statuses, - 'news': top_news, 'exam_registrations': exam_registrations, } @@ -1242,28 +1235,3 @@ def accept_name_change(request): raise Http404 return accept_name_change_by_id(int(request.POST['id'])) - - -def _get_news(top=None): - "Return the n top news items on settings.RSS_URL" - - # Don't return anything if we're in a themed site - if settings.MITX_FEATURES["USE_CUSTOM_THEME"]: - return None - - feed_data = cache.get("students_index_rss_feed_data") - if feed_data is None: - if hasattr(settings, 'RSS_URL'): - feed_data = urllib.urlopen(settings.RSS_URL).read() - else: - feed_data = render_to_string("feed.rss", None) - cache.set("students_index_rss_feed_data", feed_data, settings.RSS_TIMEOUT) - - feed = feedparser.parse(feed_data) - entries = feed['entries'][0:top] # all entries if top is None - for entry in entries: - soup = BeautifulSoup(entry.description) - entry.image = soup.img['src'] if soup.img else None - entry.summary = soup.getText() - - return entries diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index dd57e8d4d4..985dfa52d0 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -24,13 +24,13 @@ def index(request): from external_auth.views import ssl_login return ssl_login(request) if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'): - return redirect(settings.MKTG_URLS.get('ROOT')) + return redirect(settings.MKTG_URLS.get('ROOT')) university = branding.get_university(request.META.get('HTTP_HOST')) if university is None: return student.views.index(request, user=request.user) - return courseware.views.university_profile(request, university) + return redirect('/') @ensure_csrf_cookie @@ -48,4 +48,4 @@ def courses(request): if university is None: return courseware.views.courses(request) - return courseware.views.university_profile(request, university) + return redirect('/') diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index f152c0833b..7815188227 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -632,57 +632,6 @@ def mktg_course_about(request, course_id): 'show_courseware_link': show_courseware_link}) - -@ensure_csrf_cookie -@cache_if_anonymous -def static_university_profile(request, org_id): - """ - Return the profile for the particular org_id that does not have any courses. - """ - # Redirect to the properly capitalized org_id - last_path = request.path.split('/')[-1] - if last_path != org_id: - return redirect('static_university_profile', org_id=org_id) - - # Render template - template_file = "university_profile/{0}.html".format(org_id).lower() - context = dict(courses=[], org_id=org_id) - return render_to_response(template_file, context) - - -@ensure_csrf_cookie -@cache_if_anonymous -def university_profile(request, org_id): - """ - Return the profile for the particular org_id. 404 if it's not valid. - """ - virtual_orgs_ids = settings.VIRTUAL_UNIVERSITIES - meta_orgs = getattr(settings, 'META_UNIVERSITIES', {}) - - # Get all the ids associated with this organization - all_courses = modulestore().get_courses() - valid_orgs_ids = set(c.org for c in all_courses) - valid_orgs_ids.update(virtual_orgs_ids + meta_orgs.keys()) - - if org_id not in valid_orgs_ids: - raise Http404("University Profile not found for {0}".format(org_id)) - - # Grab all courses for this organization(s) - org_ids = set([org_id] + meta_orgs.get(org_id, [])) - org_courses = [] - domain = request.META.get('HTTP_HOST') - for key in org_ids: - cs = get_courses_by_university(request.user, domain=domain)[key] - org_courses.extend(cs) - - org_courses = sort_by_announcement(org_courses) - - context = dict(courses=org_courses, org_id=org_id) - template_file = "university_profile/{0}.html".format(org_id).lower() - - return render_to_response(template_file, context) - - def render_notifications(request, course, notifications): context = { 'notifications': notifications, @@ -779,12 +728,16 @@ def submission_history(request, course_id, student_username, location): except StudentModule.DoesNotExist: return HttpResponse(escape("{0} has never accessed problem {1}".format(student_username, location))) - history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id') + history_entries = StudentModuleHistory.objects.filter( + student_module=student_module + ).order_by('-id') # If no history records exist, let's force a save to get history started. if not history_entries: student_module.save() - history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id') + history_entries = StudentModuleHistory.objects.filter( + student_module=student_module + ).order_by('-id') context = { 'history_entries': history_entries, diff --git a/lms/templates/course.html b/lms/templates/course.html index 4b2133e1af..ddbae2c715 100644 --- a/lms/templates/course.html +++ b/lms/templates/course.html @@ -29,7 +29,7 @@ from courseware.courses import course_image_url, get_course_about_section % if stanford_theme_enabled(): ${get_course_about_section(course, 'university')} % else: - ${get_course_about_section(course, 'university')} + ${get_course_about_section(course, 'university')} % endif ${course.start_date_text} diff --git a/lms/templates/course_filter.html b/lms/templates/course_filter.html deleted file mode 100644 index 8e2268cad1..0000000000 --- a/lms/templates/course_filter.html +++ /dev/null @@ -1,52 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> - -
- -
diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 0f17af5fee..b086c8f2d9 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -42,9 +42,9 @@ ).css("display", "block"); } }); - + %else: - + $('#class_enroll_form').on('ajax:complete', function(event, xhr) { if(xhr.status == 200) { location.href = "${reverse('dashboard')}"; @@ -52,14 +52,14 @@ location.href = "${reverse('register_user')}?course_id=${course.id}&enrollment_action=enroll"; } else { $('#register_error').html( - (xhr.responseText ? xhr.responseText : ${_('An error occurred. Please try again later.')}) + (xhr.responseText ? xhr.responseText : 'An error occurred. Please try again later.') ).css("display", "block"); } }); %endif - - + + })(this) @@ -77,7 +77,7 @@

${course.number}: ${get_course_about_section(course, "title")} % if not self.theme_enabled(): - ${get_course_about_section(course, "university")} + ${get_course_about_section(course, "university")} % endif

diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 53dfaf6bd4..0b20634d19 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -26,8 +26,6 @@
- ## I'm removing this for now since we aren't using it for the fall. - ## <%include file="course_filter.html" />
    %for course in courses: diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 40e6f4fc05..3faef44a75 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -16,46 +16,6 @@ - - - - -
diff --git a/lms/templates/university_profile/berkeleyx.html b/lms/templates/university_profile/berkeleyx.html deleted file mode 100644 index 16b29d3282..0000000000 --- a/lms/templates/university_profile/berkeleyx.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("BerkeleyX")} - -<%block name="university_header"> -
-
-
- -

${_("BerkeleyX")}

-
-
-
- - - -<%block name="university_description"> -

${_("The University of California, Berkeley was chartered in 1868 and its flagship campus - envisioned as a \"City of Learning\" - was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units. 28 Nobel prizes have been awarded to Berkeley Alumni. There are eight Nobel Laureates, 32 MacArthur Fellows, and four Pulitzer Prize winners among the current faculty.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/delftx.html b/lms/templates/university_profile/delftx.html deleted file mode 100644 index c6d15dbb25..0000000000 --- a/lms/templates/university_profile/delftx.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("DelftX")} - -<%block name="university_header"> -
-
-
- -

${_("DelftX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Delft University of Technology is the largest and oldest technological university in the Netherlands. Our research is inspired by the desire to increase fundamental understanding, as well as by societal challenges. We encourage our students to be independent thinkers so they will become engineers capable of solving complex problems. Our students have chosen Delft University of Technology because of our reputation for quality education and research.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html deleted file mode 100644 index 1cf6a848bc..0000000000 --- a/lms/templates/university_profile/edge.html +++ /dev/null @@ -1,66 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="../stripped-main.html" /> -<%! from django.core.urlresolvers import reverse %> -<%block name="title">${_("edX edge")} -<%block name="bodyclass">no-header edge-landing - -<%block name="content"> -
-
${_("edX edge")}
-
- - -
-
- - - -<%block name="js_extra"> - - - -<%include file="../signup_modal.html" /> -<%include file="../forgot_password_modal.html" /> diff --git a/lms/templates/university_profile/epflx.html b/lms/templates/university_profile/epflx.html deleted file mode 100644 index 4e42c4f051..0000000000 --- a/lms/templates/university_profile/epflx.html +++ /dev/null @@ -1,31 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("EPFLx")} - -<%block name="university_header"> -
-
-
- -

${_("EPFLx")}

-
-
-
- - - -<%block name="university_description"> - -

${_("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 Musee 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/templates/university_profile/georgetownx.html b/lms/templates/university_profile/georgetownx.html deleted file mode 100644 index fb4a4bf5ca..0000000000 --- a/lms/templates/university_profile/georgetownx.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("GeorgetownX")} - -<%block name="university_header"> -
-
-
- -

${_("GeorgetownX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Georgetown University, the nation's oldest Catholic and Jesuit university, is one of the world's leading academic and research institutions, offering a unique educational experience that prepares the next generation of global citizens to lead and make a difference in the world. Students receive a world-class learning experience focused on educating the whole person through exposure to different faiths, cultures and beliefs.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/harvardx.html b/lms/templates/university_profile/harvardx.html deleted file mode 100644 index 7e8c4cc42b..0000000000 --- a/lms/templates/university_profile/harvardx.html +++ /dev/null @@ -1,26 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("HarvardX")} - -<%block name="university_header"> -
-
-
- -

${_("HarvardX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge. The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study.")}

-

${_("Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/mcgillx.html b/lms/templates/university_profile/mcgillx.html deleted file mode 100644 index 7c037f5642..0000000000 --- a/lms/templates/university_profile/mcgillx.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("McGillX")} - -<%block name="university_header"> -
-
-
- -

${_("McGillX")}

-
-
-
- - - -<%block name="university_description"> -

${_("McGill University is one of Canada's best-known institutions of higher learning and one of the leading universities in the world. McGill is located in vibrant multicultural Montreal, in the province of Quebec. Our 11 faculties and 11 professional schools offer more than 300 programs to some 38,000 graduate, undergraduate and continuing studies students. McGill ranks 1st in Canada among medical-doctoral universities (Maclean\'s) and 18th in the world (QS World University Rankings).")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/mitx.html b/lms/templates/university_profile/mitx.html deleted file mode 100644 index 161c9aedbd..0000000000 --- a/lms/templates/university_profile/mitx.html +++ /dev/null @@ -1,27 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("MITx")} - -<%block name="university_header"> -
-
-
- -

${_("MITx")}

-
-
-
- - - -<%block name="university_description"> -

${_("The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.")}

-

${_("MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}

-

${_("Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/ricex.html b/lms/templates/university_profile/ricex.html deleted file mode 100644 index 0fe52063fc..0000000000 --- a/lms/templates/university_profile/ricex.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("RiceX")} - -<%block name="university_header"> -
-
-
- -

${_("RiceX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Located on a 300-acre forested campus in Houston, Rice University is consistently ranked among the nation's top 20 universities by U.S. News & World Report. Rice has highly respected schools of Architecture, Business, Continuing Studies, Engineering, Humanities, Music, Natural Sciences and Social Sciences and is home to the Baker Institute for Public Policy. With 3,708 undergraduates and 2,374 graduate students, Rice's undergraduate student-to-faculty ratio is 6-to-1. Its residential college system builds close-knit communities and lifelong friendships, just one reason why Rice has been ranked No. 1 for best quality of life multiple times by the Princeton Review and No. 2 for \"best value\" among private universities by Kiplinger's Personal Finance.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/template.html b/lms/templates/university_profile/template.html deleted file mode 100644 index 8dd2cda28d..0000000000 --- a/lms/templates/university_profile/template.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("SCHOOLX")} - -<%block name="university_header"> -
-
-
- -

${_("SCHOOLX")}

-
-
-
- - - -<%block name="university_description"> -

- - -${parent.body()} diff --git a/lms/templates/university_profile/torontox.html b/lms/templates/university_profile/torontox.html deleted file mode 100644 index 9d17bb200a..0000000000 --- a/lms/templates/university_profile/torontox.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("University of TorontoX")} - -<%block name="university_header"> -
-
-
- -

${_("University of TorontoX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Established in 1827, the University of Toronto is a vibrant and diverse academic community. It includes 80,000 students, 12,000 colleagues holding faculty appointments, 200 librarians, and 6,000 staff members across three distinctive campuses and at many partner sites, including world-renowned hospitals. With over 800 undergraduate programs, 150 graduate programs, and 40 professional programs, U of T attracts students of the highest calibre, from across Canada and from 160 countries around the world. The University is one of the most respected and influential institutions of higher education and advanced research in the world. Its strengths extend across the full range of disciplines: the 2012-13 Times Higher Education ranking groups the University of Toronto with Stanford, UC Berkeley, UCLA, Columbia, Cambridge, Oxford, the University of Melbourne, and the University of Michigan as the only institutions in the top 27 in all 6 broad disciplinary areas. The University is also consistently rated one of Canada\'s Top 100 employers, and ranks with Harvard and Yale for the top university library resources in North America.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/utaustinx.html b/lms/templates/university_profile/utaustinx.html deleted file mode 100644 index c85cf7969b..0000000000 --- a/lms/templates/university_profile/utaustinx.html +++ /dev/null @@ -1,24 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("UTAustinX")} - -<%block name="university_header"> -
-
-
- -

${_("UTAustinx")}

-
-
-
- - -<%block name="university_description"> -

${_("The University of Texas at Austin is the top-ranked public university in a nearly 1,000-mile radius, and is ranked in the top 25 universities in the world. Students have been finding their passion in life at UT Austin for more than 130 years, and it has been a member of the prestigious AAU since 1929. UT Austin combines the academic depth and breadth of a world research institute (regularly ranking within the top three producers of doctoral degrees in the country) with the fun and excitement of a big-time collegiate experience. It is currently the fifth-largest university in America, with more than 50,000 students and 3,000 professors across 17 colleges and schools. UT Austin will be opening the Dell Medical School in 2016.")}

- - -${parent.body()} diff --git a/lms/templates/university_profile/utx.html b/lms/templates/university_profile/utx.html deleted file mode 100644 index ac8ba86817..0000000000 --- a/lms/templates/university_profile/utx.html +++ /dev/null @@ -1,29 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> -<%! - from django.core.urlresolvers import reverse -%> - -<%block name="title">${_("UTx")} - -<%block name="university_header"> -
-
-
- -

${_("UTx")}

-
-
-
- - - -<%block name="university_description"> -

${_("Educating students, providing care for patients, conducting groundbreaking research and serving the needs of Texans and the nation for more than 130 years, The University of Texas System is one of the largest public university systems in the United States, with nine academic universities and six health science centers. Student enrollment exceeded 215,000 in the 2011 academic year. The UT System confers more than one-third of the state\'s undergraduate degrees and educates nearly three-fourths of the state\'s health care professionals annually. The UT System has an annual operating budget of $13.1 billion (FY 2012) including $2.3 billion in sponsored programs funded by federal, state, local and private sources. With roughly 87,000 employees, the UT System is one of the largest employers in the state.")}

-

${_('Find out about The University of Texas at Austin.') % reverse('university_profile', args=['UTAustinX'])}

- - -${parent.body()} diff --git a/lms/templates/university_profile/wellesleyx.html b/lms/templates/university_profile/wellesleyx.html deleted file mode 100644 index fe3a82c57e..0000000000 --- a/lms/templates/university_profile/wellesleyx.html +++ /dev/null @@ -1,25 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="base.html" /> -<%namespace name='static' file='../static_content.html'/> - -<%block name="title">${_("WellesleyX")} - -<%block name="university_header"> -
-
-
- -

${_("WellesleyX")}

-
-
-
- - - -<%block name="university_description"> -

${_("Since 1875, Wellesley College has been the preeminent liberal arts college for women. Known for its intellectual rigor and its remarkable track record for the cultivation of women leaders in every arena, Wellesley-only 12 miles from Boston-is home to some 2300 undergraduates from every state and 75 countries.")}

- - -${parent.body()} diff --git a/lms/urls.py b/lms/urls.py index 5948f65226..59cadb8a5b 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -73,32 +73,6 @@ urlpatterns += ( url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), ) - - -# University profiles only make sense in the default edX context -if not settings.MITX_FEATURES["USE_CUSTOM_THEME"]: - urlpatterns += ( - ## - ## Only universities without courses should be included here. If - ## courses exist, the dynamic profile rule below should win. - ## - url(r'^(?i)university_profile/WellesleyX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'WellesleyX'}), - url(r'^(?i)university_profile/McGillX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'McGillX'}), - url(r'^(?i)university_profile/TorontoX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'TorontoX'}), - url(r'^(?i)university_profile/RiceX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'RiceX'}), - url(r'^(?i)university_profile/ANUx$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'ANUx'}), - url(r'^(?i)university_profile/EPFLx$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'EPFLx'}), - - url(r'^university_profile/(?P[^/]+)$', 'courseware.views.university_profile', - name="university_profile"), - ) - #Semi-static views (these need to be rendered and have the login bar, but don't change) urlpatterns += ( url(r'^404$', 'static_template_view.views.render',