From c41c084b393b89cb88d7e72c80948d8cf5b31f1e Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 12 Oct 2012 09:55:32 -0400 Subject: [PATCH 1/2] Wire up login and register forms for edx landing page --- lms/static/sass/multicourse/_edge.scss | 4 +++ lms/templates/university_profile/edge.html | 32 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss index 32580b964b..a099dded05 100644 --- a/lms/static/sass/multicourse/_edge.scss +++ b/lms/static/sass/multicourse/_edge.scss @@ -174,4 +174,8 @@ $paleYellow: #fffcf1; text-indent: -9999px; overflow: hidden; } + + #register .login-extra { + display: none; + } } \ No newline at end of file diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html index e102555975..a6c714318c 100644 --- a/lms/templates/university_profile/edge.html +++ b/lms/templates/university_profile/edge.html @@ -1,15 +1,15 @@ <%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
- \ No newline at end of file + + +<%block name="js_extra"> + + + +<%include file="../signup_modal.html" /> \ No newline at end of file From 4814f8c38eac3cec167cba3619bd5d05eaba7e6c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 12 Oct 2012 10:31:46 -0400 Subject: [PATCH 2/2] Cleaning up logos for edge landing page --- cms/static/sass/_landing.scss | 2 +- .../static/images}/edge-logo-large.png | Bin .../static/images}/edge-logo-small.png | Bin lms/static/images/edge-logo-large.png | Bin 7465 -> 0 bytes lms/static/images/edge-on-edx-logo.png | 1 + 5 files changed, 2 insertions(+), 1 deletion(-) rename {cms/static/img => common/static/images}/edge-logo-large.png (100%) rename {cms/static/img => common/static/images}/edge-logo-small.png (100%) delete mode 100644 lms/static/images/edge-logo-large.png create mode 120000 lms/static/images/edge-on-edx-logo.png diff --git a/cms/static/sass/_landing.scss b/cms/static/sass/_landing.scss index 9fbf00e1ec..16f1b5b5a7 100644 --- a/cms/static/sass/_landing.scss +++ b/cms/static/sass/_landing.scss @@ -119,7 +119,7 @@ width: 143px; height: 39px; margin: auto; - background: url(../img/edge-logo-small.png) no-repeat; + background: url(../images/edge-logo-small.png) no-repeat; text-indent: -9999px; overflow: hidden; } diff --git a/cms/static/img/edge-logo-large.png b/common/static/images/edge-logo-large.png similarity index 100% rename from cms/static/img/edge-logo-large.png rename to common/static/images/edge-logo-large.png diff --git a/cms/static/img/edge-logo-small.png b/common/static/images/edge-logo-small.png similarity index 100% rename from cms/static/img/edge-logo-small.png rename to common/static/images/edge-logo-small.png diff --git a/lms/static/images/edge-logo-large.png b/lms/static/images/edge-logo-large.png deleted file mode 100644 index 2933ec53493222881fd85a317c1e5f1e81f035e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7465 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 SRqUUimpU5y>MvC7BK`+2E0-Do diff --git a/lms/static/images/edge-on-edx-logo.png b/lms/static/images/edge-on-edx-logo.png new file mode 120000 index 0000000000..af5121d3f4 --- /dev/null +++ b/lms/static/images/edge-on-edx-logo.png @@ -0,0 +1 @@ +../../../common/static/images/edge-logo-small.png \ No newline at end of file