Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drupal integration - further color sync, copy edits, and removing courseware button when on login page

Browse Source
This commit is contained in:
Brian Talbot
2013-01-22 14:38:31 -05:00
committed by John Jarvis
parent e1fae8e885
commit cbe35eeab3
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/sass/base/_variables.scss
View File

@@ -28,7 +28,7 @@ $outer-border-color: rgb(170, 170, 170);
// edx.org-related
$m-gray-l: rgb(247, 247, 247);
$m-gray: rgb(67,67,67);
$m-blue: rgb(23,135,183);
$m-blue: rgb(23,174,223);
$m-blue-s: rgb(2,159,211);
$m-base-font-size: em(16);

10
lms/static/sass/multicourse/_account.scss
View File

@@ -409,7 +409,11 @@
// =====
// login
.login {
.view-login {
.nav-courseware .cta-login {
display: none;
}
.group-form-accountpreferences {
padding-top: 0;
@@ -418,7 +422,7 @@
}
// register
.register {
.view-register {
.group-form-accountacknowledgements {
padding-top: 0;
@@ -427,7 +431,7 @@
}
// password reset
.passwordreset {
.view-passwordreset {
}

4
lms/templates/login.html
View File

@@ -96,9 +96,9 @@
<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">
<span class="wrapper wrapper-action action-secondary">
<a href="#" class="action action-register">Not enrolled? Register</a>
</span> -->
</span>
% endif
</div>
</form>

17
lms/templates/register.html
View File

@@ -105,7 +105,7 @@
<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 earn</span>
<span class="tip tip-input">Needed for any certificates you may earn</span>
</li>
</ol>
@@ -186,14 +186,9 @@
<ol class="list-input">
<li class="field-group">
<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 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>
</li>
</ol>
@@ -202,9 +197,9 @@
<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">
<span class="wrapper wrapper-action action-secondary">
<a href="${reverse('login')}" class="action action-login">Already have an account? Login</a>
</span> -->
</span>
% endif
</div>
</form>