added edge logo; added edge temp landing page

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', {})

cms/static/sass/_base.scss

@@ -229,6 +229,9 @@ body.show-wip {
     }
 }
 
+.waiting {
+    
+}
 .toast-notification {
   display: none;
   position: fixed;

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;

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;
+  }
+}

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;
+	}
 }

cms/static/sass/_variables.scss

@@ -17,4 +17,5 @@ $blue: #5597dd;
 $lightGrey: #edf1f5;
 $mediumGrey: #ced2db;
 $darkGrey: #8891a1;
+$extraDarkGrey: #3d4043;
 $paleYellow: #fffcf1;

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";

cms/templates/temp-course-landing.html

@@ -32,7 +32,7 @@
 	</div>
 	</article>
 	<footer>
-		<a href="#" class="edx-labs-logo-small">edX Labs</a>
+		<a href="#" class="edge-logo">edX edge</a>
 	</footer>
 </div>
 </%block>

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>
+<%block name="bodyclass">no-header edge-landing</%block>
+
+<%block name="content">
+
+<header>
+  <div class="log-in-form">
+    <form>
+      <div class="column">
+        <input name="email" type="email" class="email-field" tabindex="1" placeholder="email">
+      </div>
+      <div class="column">
+        <input name="password" type="password" class="password-field" tabindex="2" placeholder="password">
+      </div>
+      <div class="column submit">
+        <input name="submit" type="submit" value="Log In" class="log-in-submit-button" tabindex="3">
+        <a href="#" class="forgot-button">Forgot password?</a>
+      </div>
+    </form>
+  </div>
+</header>
+
+<div class="main-wrapper">
+  <div class="edx-edge-logo-large"></div>
+  <a href="#" class="column left">
+    <h2>Create a course</h2>
+    <p>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.</p>
+  </a>
+  <a href="#" class="column right">
+    <h2>Register for courses</h2>
+    <p>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.</p>
+  </a>
+</div>
+
+</%block>

cms/urls.py

@@ -41,6 +41,9 @@ urlpatterns = ('',
     url(r'^server_error$', 'contentstore.views.server_error', name='server_error'),
 
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
+
+    # temporary landing page for edge
+    url(r'^edge/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edge', name='edge'),
 )
 
 # User creation and updating views