diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 26ed3c53d2..49bd1c7304 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -848,3 +848,8 @@ def asset_index(request, org, course, name): 'assets': asset_display, 'upload_asset_callback_url': upload_asset_callback_url }) + + +# points to the temporary edge page +def edge(request): + return render_to_response('university_profiles/edge.html', {}) diff --git a/cms/static/img/edge-logo-large.png b/cms/static/img/edge-logo-large.png new file mode 100644 index 0000000000..2933ec5349 Binary files /dev/null and b/cms/static/img/edge-logo-large.png differ diff --git a/cms/static/img/edge-logo-small.png b/cms/static/img/edge-logo-small.png new file mode 100644 index 0000000000..41bd7127f5 Binary files /dev/null and b/cms/static/img/edge-logo-small.png differ diff --git a/cms/static/img/edx-studio-large.png b/cms/static/img/edx-studio-large.png new file mode 100644 index 0000000000..d3ea3382a8 Binary files /dev/null and b/cms/static/img/edx-studio-large.png differ diff --git a/cms/static/img/edx-studio-logo-small.png b/cms/static/img/edx-studio-logo-small.png new file mode 100644 index 0000000000..728a3f81e0 Binary files /dev/null and b/cms/static/img/edx-studio-logo-small.png differ diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index ac93a0f60f..05e40c9483 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -229,6 +229,9 @@ body.show-wip { } } +.waiting { + +} .toast-notification { display: none; position: fixed; diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index efe4556b50..2f43bfd208 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -92,6 +92,20 @@ } } +@mixin dark-grey-button { + @include button; + border: 1px solid #1c1e20; + border-radius: 3px; + background: -webkit-linear-gradient(top, rgba(255, 255, 255, .2), rgba(255, 255, 255, 0)) $extraDarkGrey; + box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset; + color: #fff; + + &:hover { + background-color: #595f64; + color: #fff; + } +} + @mixin edit-box { padding: 15px 20px; border-radius: 3px; diff --git a/cms/static/sass/_edge.scss b/cms/static/sass/_edge.scss new file mode 100644 index 0000000000..9d8562b62a --- /dev/null +++ b/cms/static/sass/_edge.scss @@ -0,0 +1,86 @@ +.edge-landing { + border-top: 5px solid $blue; + + header { + @include clearfix; + background: $extraDarkGrey; + border-bottom: 3px solid $blue; + } + + .main-wrapper { + width: 942px; + margin: auto; + + .content { + @extend .window; + padding: 24px 60px 36px; + border-radius: 3px; + @include clearfix; + } + + .log-in-form { + float: left; + width: 470px; + margin-right: 50px; + padding-right: 49px; + border-right: 1px solid $lightGrey; + + .row { + margin-bottom: 20px; + border-bottom: none; + } + + label { + font-weight: 700; + } + + input { + width: 100%; + font-size: 21px; + font-weight: 300; + } + + .log-in-submit-button { + @include blue-button; + width: 130px; + padding: 8px 20px 10px; + font-size: 16px; + } + + .forgot-button { + font-size: 12px; + margin-left: 10px; + } + } + + .sign-up { + float: left; + width: 250px; + + .register-button { + @include grey-button; + margin-top: 20px; + } + } + + h2 { + margin-bottom: 30px; + font-size: 24px; + font-weight: 300; + } + + h3 { + margin-bottom: 30px; + font-size: 24px; + font-weight: 300; + } + } + + .edx-edge-logo-large { + display: block; + width: 263px; + height: 72px; + margin: 150px auto 50px; + background: url(../img/edge-logo-large.png) no-repeat; + } +} \ No newline at end of file diff --git a/cms/static/sass/_landing.scss b/cms/static/sass/_landing.scss index d8e3559635..9fbf00e1ec 100644 --- a/cms/static/sass/_landing.scss +++ b/cms/static/sass/_landing.scss @@ -113,4 +113,14 @@ text-indent: -9999px; overflow: hidden; } + + .edge-logo { + display: block; + width: 143px; + height: 39px; + margin: auto; + background: url(../img/edge-logo-small.png) no-repeat; + text-indent: -9999px; + overflow: hidden; + } } \ No newline at end of file diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss index 0bccaea0f0..1ff7c6d40d 100644 --- a/cms/static/sass/_login.scss +++ b/cms/static/sass/_login.scss @@ -1,7 +1,15 @@ +.edx-studio-logo-large { + display: block; + width: 224px; + height: 45px; + margin: 100px auto 30px; + background: url(../img/edx-studio-large.png) no-repeat; +} + .sign-up-box, .log-in-box { width: 500px; - margin: 100px auto; + margin: auto; border-radius: 3px; header { diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss index 432a78058b..5d1a9ebd46 100644 --- a/cms/static/sass/_variables.scss +++ b/cms/static/sass/_variables.scss @@ -17,4 +17,5 @@ $blue: #5597dd; $lightGrey: #edf1f5; $mediumGrey: #ced2db; $darkGrey: #8891a1; +$extraDarkGrey: #3d4043; $paleYellow: #fffcf1; \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 4acdc320c7..fd3881a371 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -17,6 +17,7 @@ @import "static-pages"; @import "users"; @import "course-info"; +@import "edge"; @import "landing"; @import "graphics"; @import "modal"; diff --git a/cms/templates/login.html b/cms/templates/login.html index a3a7a8cb4f..a604024804 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -5,9 +5,11 @@ <%block name="content"> +
+
-

Log in to edX

+

Log in to edX studio

diff --git a/cms/templates/signup.html b/cms/templates/signup.html index 864db25956..93acdfad71 100644 --- a/cms/templates/signup.html +++ b/cms/templates/signup.html @@ -3,9 +3,12 @@ <%block name="bodyclass">no-header <%block name="content"> + +
+
\ No newline at end of file diff --git a/cms/urls.py b/cms/urls.py index 33a14fe80e..811d47657f 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -35,12 +35,15 @@ urlpatterns = ('', url(r'^(?P[^/]+)/(?P[^/]+)/assets/(?P[^/]+)$', 'contentstore.views.asset_index', name='asset_index'), # temporary landing page for a course - url(r'^landing/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.landing', name='landing'), + url(r'^edge/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.landing', name='landing'), url(r'^not_found$', 'contentstore.views.not_found', name='not_found'), url(r'^server_error$', 'contentstore.views.server_error', name='server_error'), url(r'^(?P[^/]+)/(?P[^/]+)/assets/(?P[^/]+)$', 'contentstore.views.asset_index', name='asset_index'), + + # temporary landing page for edge + url(r'^edge$', 'contentstore.views.edge', name='edge'), ) # User creation and updating views diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html new file mode 100644 index 0000000000..c8f0b69242 --- /dev/null +++ b/lms/templates/university_profile/edge.html @@ -0,0 +1,36 @@ +<%inherit file="base.html" /> +<%! from django.core.urlresolvers import reverse %> +<%block name="title">edX edge +<%block name="bodyclass">no-header edge-landing + +<%block name="content"> + +
+
+
+ + +
+
+ + \ No newline at end of file