Skip to content

Sarina/remove university refs #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarina merged 1 commit into from
Jan 14, 2014
Merged

Sarina/remove university refs #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions lms/djangoapps/courseware/features/homepage.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,3 @@ Feature: LMS.Homepage for web users
| faq | FAQ |
| contact | Contact|
| press | Press |


# TODO: test according to domain or policy
Scenario: User can see the partner institutions
Given I visit the homepage
Then I should see the following Partners in the Partners section
| Partner |
| MITx |
| HarvardX |
| BerkeleyX |
| UTx |
| WellesleyX |
| GeorgetownX |

# # TODO: Add scenario that tests the courses available
# # using a policy or a configuration file
8 changes: 0 additions & 8 deletions lms/djangoapps/courseware/features/homepage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@
from nose.tools import assert_in, assert_equals # pylint: disable=E0611


@step(u'I should see the following Partners in the Partners section')
def i_should_see_partner(step):
partners = world.browser.find_by_css(".partner .name span")
names = set(span.html for span in partners)
for partner in step.hashes:
assert_in(partner['Partner'], names)


@step(u'I should see the following links and ids')
def should_see_a_link_called(step):
for link_id_pair in step.hashes:
Expand Down
113 changes: 2 additions & 111 deletions lms/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,118 +52,9 @@ <h2>${_("For anyone, anywhere, anytime")}</h2>
</div>
</header>

<section class="container">
<section class="container">
<section class="highlighted-courses">
## Disable university partner logos and sites for non-edX sites
% if not self.theme_enabled():
<h2>${_('Explore free courses from {span_start}{platform_name}{span_end} universities').format(platform_name="edX", span_start='<span class="edx">', span_end='</span>')}</h2>

<section class="university-partners university-partners2x6">
<ol class="partners">
<li class="partner mit">
<a href="#">
<img src="${static.url('images/university/mit/mit.png')}" />
<div class="name">
<span>MITx</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/harvard/harvard.png')}" />
<div class="name">
<span>HarvardX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/berkeley/berkeley.png')}" />
<div class="name">
<span>BerkeleyX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/ut/ut-rollover_350x150.png')}" />
<div class="name">
<span>UTx</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/mcgill/mcgill.png')}" />
<div class="name">
<span>McGillX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/anu/anu.png')}" />
<div class="name">
<span>ANUx</span>
</div>
</a>
</li>
</ol>

<hr />

<ol class="partners">
<li class="partner">
<a href="#">
<img src="${static.url('images/university/wellesley/wellesley-rollover_350x150.png')}" />
<div class="name">
<span>WellesleyX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/georgetown/georgetown-rollover_350x150.png')}" />
<div class="name">
<span>GeorgetownX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/toronto/toronto.png')}" />
<div class="name">
<span>University of TorontoX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/epfl/epfl.png')}" />
<div class="name">
<span>EPFLx</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/delft/delft.png')}" />
<div class="name">
<span>DelftX</span>
</div>
</a>
</li>
<li class="partner">
<a href="#">
<img src="${static.url('images/university/rice/rice.png')}" />
<div class="name">
<span>RiceX</span>
</div>
</a>
</li>
</ol>
</section>
% endif
## NOTE: To put a title here surround in <h2> tags

% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
<section class="courses">
Expand Down