Skip to content

E
edx-platform
Commit 83745348 by Brian Talbot Committed by John Jarvis
Options

drupal integration - revised copy, layout, and styles per marketing feedback

parent cbe35eea
Showing with 71 additions and 37 deletions
lms/static/sass/multicourse/_account.scss
......@@ -106,6 +106,17 @@
margin-top: $baseline;
font-size: em(14);
text-align: right;
.action {
@include button(simple, $m-gray-l);
@include box-sizing(border-box);
@include border-radius(3px);
padding: ($baseline/4) ($baseline/2);
font-size: em(16);
font-weight: 700;
letter-spacing: 0;
text-align: center;
}
}
}
}
......@@ -351,7 +362,7 @@
.action-primary {
float: left;
width: flex-grid(5,8);
width: flex-grid(8,8);
margin-right: flex-gutter(0);
}
......@@ -411,10 +422,6 @@
// login
.view-login {
.nav-courseware .cta-login {
display: none;
}
.group-form-accountpreferences {
padding-top: 0;
padding-bottom: 0;
......
lms/static/sass/shared/_header.scss
......@@ -278,6 +278,14 @@ header.global {
color: $m-blue-s;
}
}
&.active {
a {
text-decoration: none;
color: $m-blue-s;
}
}
}
// logged in
......@@ -316,4 +324,19 @@ header.global {
}
}
// =====
// page-based nav states
.view-howitworks .nav-global-01,
.view-courses .nav-global-02,
.view-schools .nav-global-03,
.view-register .nav-global-04 {
a {
text-decoration: none;
color: $m-blue-s !important;
}
}
}
\ No newline at end of file
lms/templates/forgot_password_modal.html
......@@ -17,7 +17,7 @@
<ol class="list-input">
<li class="field required text" id="field-email">
<label for="id_email">Your E-mail Address</label>
<input class="" id="id_email" type="email" name="email" value="" placeholder="eg. example@edx.org" />
<input class="" id="id_email" type="email" name="email" value="" placeholder="example: username@domain.com" />
<span class="tip tip-input">This is the email address you used to register with edX</span>
</li>
</ol>
......
lms/templates/login.html
......@@ -70,11 +70,11 @@
<ol class="list-input">
<li class="field required text" id="field-email">
<label for="email">E-mail</label>
<input class="" id="email" type="email" name="email" value="" placeholder="eg. example@edx.org" />
<input class="" id="email" type="email" name="email" value="" placeholder="example: username@domain.com" />
</li>
<li class="field required password" id="field-password">
<label for="password">Password</label>
<input id="password" type="password" name="password" value="" placeholder="*****" />
<input id="password" type="password" name="password" value="" />
<span class="tip tip-input">
<a href="#forgot-password-modal" rel="leanModal" class="pwd-reset action action-forgotpw">Forgot password?</a>
</span>
......@@ -94,12 +94,7 @@
</fieldset>
<div class="form-actions">
<button name="submit" type="submit" id="submit" class="action action-primary action-update">Access My Courses</button>
% if has_extauth_info is UNDEFINED:
<span class="wrapper wrapper-action action-secondary">
<a href="#" class="action action-register">Not enrolled? Register</a>
</span>
% endif
<button name="submit" type="submit" id="submit" class="action action-primary action-update">Log into My edX Account &amp; Access My Courses</button>
</div>
</form>
</section>
......@@ -119,7 +114,7 @@
<div class="cta cta-help">
<h3>Need Help?</h3>
<p>Looking for help in logging in or with your edX account? <a href="#">View our help section for contact information and answers to commonly asked questions</a></p>
<p>Looking for help in logging in or with your edX account? <a href="#">View our help section for answers to commonly asked questions</a></p>
</div>
</aside>
</section>
lms/templates/navigation.html
......@@ -46,11 +46,8 @@ site_status_msg = get_site_status_msg(course_id)
% if user.is_authenticated():
<ol class="left nav-global authenticated">
<li class="nav-global-02">
<a href="${reverse('courses')}">Courses</a>
</li>
<li class="nav-global-03">
<a href="#">Schools</a>
<li class="nav-global-01">
<a href="${reverse('courses')}">Find Courses</a>
</li>
</ol>
......@@ -91,7 +88,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="right nav-courseware">
<li class="nav-courseware-01">
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
<a class="cta cta-login" href="#">Courseware</a>
<a class="cta cta-login" href="#">Login</a>
% endif
</li>
</ol>
......
lms/templates/register.html
......@@ -91,21 +91,21 @@
<ol class="list-input">
<li class="field required text" id="field-email">
<label for="email">E-mail</label>
<input class="" id="email" type="email" name="email" value="" placeholder="eg. example@edx.org" />
<input class="" id="email" type="email" name="email" value="" placeholder="example: username@domain.com" />
</li>
<li class="field required password" id="field-password">
<label for="password">Password</label>
<input id="password" type="password" name="password" value="" placeholder="*****" />
<input id="password" type="password" name="password" value="" />
</li>
<li class="field required text" id="field-username">
<label for="username">Public Username</label>
<input id="username" type="text" name="username" value="" placeholder="e.g. JaneDoe314159" />
<input id="username" type="text" name="username" value="" placeholder="example: JaneDoe" />
<span class="tip tip-input">Will be shown in any discussions or forums you participate in</span>
</li>
<li class="field required text" id="field-name">
<label for="name">Full Name</label>
<input id="name" type="text" name="name" value="" placeholder="e.g. Jane Doe" />
<span class="tip tip-input">Needed for any certificates you may earn</span>
<input id="name" type="text" name="name" value="" placeholder="example: Jane Doe" />
<span class="tip tip-input">Needed for any certificates you may earn <strong>(cannot be changed later)</strong></span>
</li>
</ol>
......@@ -119,7 +119,7 @@
<ol class="list-input">
<li class="field required text" id="field-username">
<label for="username">Public Username</label>
<input id="username" type="text" name="username" value="${extauth_username}" placeholder="e.g. JaneDoe314159" />
<input id="username" type="text" name="username" value="${extauth_username}" placeholder="example: JaneDoe" />
<span class="tip tip-input">Will be shown in any discussions or forums you participate in</span>
</li>
</ol>
......@@ -175,7 +175,7 @@
</li>
<li class="field text" id="field-goals">
<label for="goals">Do you have any goals in signing up for edX?</label>
<label for="goals">Please share with us any goals you may have in signing up for edX?</label>
<textarea id="goals" name="goals" value=""></textarea>
</li>
</ol>
......@@ -186,9 +186,14 @@
<ol class="list-input">
<li class="field-group">
<div class="field required checkbox" id="field-toshonorcode">
<input id="toshonorcode-yes" type="checkbox" name="terms_of_service_honor_code" value="true" />
<label for="toshonorcode-yes">I agree to the <a href="${reverse('tos')}" class="new-vp">Terms of Service</a> and <a href="${reverse('honor')}" class="new-vp">Honor Code</a></label>
<div class="field required checkbox" id="field-tos">
<input id="tos-yes" type="checkbox" name="terms_of_service" value="true" />
<label for="tos-yes">I agree to the <a href="${reverse('tos')}" class="new-vp">Terms of Service</a></label>
</div>
<div class="field required checkbox" id="field-honorcode">
<input id="honorcode-yes" type="checkbox" name="honor_code" value="true" />
<label for="honorcode-yes">I agree to the <a href="${reverse('honor')}" class="new-vp">Honor Code</a></label>
</div>
</li>
</ol>
......@@ -196,11 +201,6 @@
<div class="form-actions">
<button name="submit" type="submit" id="submit" class="action action-primary action-update">Register &amp; Create My Account</button>
% if has_extauth_info is UNDEFINED:
<span class="wrapper wrapper-action action-secondary">
<a href="${reverse('login')}" class="action action-login">Already have an account? Login</a>
</span>
% endif
</div>
</form>
</section>
......@@ -210,9 +210,19 @@
<h3 class="is-hidden">Registration Help</h3>
</header>
<div class="cta cta-welcome">
<h3>Welcome to edX</h3>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis. [Matt to provide copy]</p>
</div>
<div class="cta cta-welcome">
<h3>What an edX Account Means</h3>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis. [Matt to provide copy]</p>
</div>
<div class="cta cta-help">
<h3>Need Help?</h3>
<p>Looking for help in registering with edX? View our <a href="#">help section for contact information and answers to commonly asked questions</a></p>
<p>Looking for help in registering with edX? View our <a href="#">help section for answers to commonly asked questions</a></p>
</div>
</aside>
</section>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment