From fec710abde0fbbd60f3b4521223abbeb4044d55f Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 9 Oct 2012 07:09:56 -0400 Subject: [PATCH] added edge logo; added edge temp landing page --- cms/djangoapps/contentstore/views.py | 5 ++ cms/static/img/edge-logo-large.png | Bin 0 -> 7465 bytes cms/static/img/edge-logo-small.png | Bin 0 -> 4155 bytes cms/static/sass/_base.scss | 3 + cms/static/sass/_cms_mixins.scss | 14 ++++ cms/static/sass/_edge.scss | 105 +++++++++++++++++++++++++ cms/static/sass/_landing.scss | 10 +++ cms/static/sass/_variables.scss | 1 + cms/static/sass/base-style.scss | 1 + cms/templates/temp-course-landing.html | 2 +- cms/templates/temp-edge.html | 37 +++++++++ cms/urls.py | 3 + 12 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 cms/static/img/edge-logo-large.png create mode 100644 cms/static/img/edge-logo-small.png create mode 100644 cms/static/sass/_edge.scss create mode 100644 cms/templates/temp-edge.html diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 26ed3c53d2..cf57e6b04b 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, org, course, coursename): + return render_to_response('temp-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 0000000000000000000000000000000000000000..2933ec53493222881fd85a317c1e5f1e81f035e0 GIT binary patch literal 7465 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 SRqUUimpU5y>MvC7BK`+2E0-Do literal 0 HcmV?d00001 diff --git a/cms/static/img/edge-logo-small.png b/cms/static/img/edge-logo-small.png new file mode 100644 index 0000000000000000000000000000000000000000..41bd7127f5dbdb800a6ecab706685b2970651978 GIT binary patch literal 4155 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 HTkQV;yv0{A literal 0 HcmV?d00001 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..e057228f52 --- /dev/null +++ b/cms/static/sass/_edge.scss @@ -0,0 +1,105 @@ +.edge-landing { + header { + @include clearfix; + background: $extraDarkGrey; + border-bottom: 3px solid $blue; + } + + .log-in-form { + @include clearfix; + float: right; + padding: 10px; + + .column { + float: left; + width: 200px; + margin-right: 10px; + + &.submit { + width: auto; + } + + input { + width: 100%; + padding: 5px 8px 7px; + @include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1)); + background-color: #4e5153; + border-color: #1c1e20; + color: #fff; + } + + input[type="submit"] { + @include dark-grey-button; + position: relative; + top: -1px; + width: 100px; + padding: 6px 20px 8px; + font-size: 11px; + font-weight: 400; + } + } + + .forgot-button { + font-size: 11px; + margin-left: 5px; + } + } + + .main-wrapper { + width: 980px; + margin: auto; + + .column { + float: left; + width: 400px; + padding: 26px 40px 40px; + border-radius: 3px; + background: #fff; + -webkit-transition: all .15s; + @include box-shadow(0 0 50px rgba(0, 0, 0, .1)); + + &:hover { + background: $blue; + + h2 { + color: #fff; + } + + p { + color: #bee1f0; + } + } + + &.left { + margin-right: 10px; + } + + &.right { + margin-left: 10px; + } + } + + h2 { + margin-bottom: 12px; + font-size: 30px; + font-weight: 300; + color: $blue; + @include transition(all .15s); + } + + p { + font-size: 14px; + line-height: 1.4; + color: #7d7d7d; + @include transition(all .15s); + } + } + + .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/_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/temp-course-landing.html b/cms/templates/temp-course-landing.html index 9f785e022c..4c3aab4c67 100644 --- a/cms/templates/temp-course-landing.html +++ b/cms/templates/temp-course-landing.html @@ -32,7 +32,7 @@ \ No newline at end of file diff --git a/cms/templates/temp-edge.html b/cms/templates/temp-edge.html new file mode 100644 index 0000000000..951f6d01d1 --- /dev/null +++ b/cms/templates/temp-edge.html @@ -0,0 +1,37 @@ +<%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"> + +
+ +
+ +
+
+ +

Create a course

+

Hendrerit in vulputate velit, esse molestie consequat vel illum dolore eu feugiat. Exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Modo typi qui nunc nobis, videntur parum clari.

+ + +

Register for courses

+

Hendrerit in vulputate velit, esse molestie consequat vel illum dolore eu feugiat. Exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Modo typi qui nunc nobis, videntur parum clari.

+ +
+ + \ No newline at end of file diff --git a/cms/urls.py b/cms/urls.py index 33a14fe80e..d4020d76ef 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -41,6 +41,9 @@ urlpatterns = ('', 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/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.edge', name='edge'), ) # User creation and updating views