Merge pull request #842 from MITx/feature/tomg/edge

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):
+    return render_to_response('university_profiles/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

+.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

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

cms/static/sass/_login.scss

+.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 {

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

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/login.html

@@ -5,9 +5,11 @@
 
 <%block name="content">
 
+  <div class="edx-studio-logo-large"></div>
+
   <article class="log-in-box">
     <header>
-      <h1>Log in to edX</h1>
+      <h1>Log in to edX studio</h1>
     </header>
     <form class="log-in-form" id="login_form" action="login_post" method="post">
       <div class="row">

cms/templates/signup.html

@@ -3,9 +3,12 @@
 <%block name="bodyclass">no-header</%block>
 
 <%block name="content">
+
+<div class="edx-studio-logo-large"></div>
+
 <article class="sign-up-box">
   <header>
-    <h1>Register for edX Labs</h1>
+    <h1>Register for edX studio</h1>
   </header>
   <form id="register_form" method="post">
     <div id="register_error" name="register_error"></div>

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>
\ No newline at end of file

cms/urls.py

@@ -35,12 +35,15 @@ urlpatterns = ('',
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
 
     # temporary landing page for a course
-    url(r'^landing/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),
+    url(r'^edge/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', '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<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', '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

lms/templates/university_profile/edge.html

+<%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">
+
+<div class="main-wrapper">
+  <div class="edx-edge-logo-large"></div>
+  <div class="content">
+    <div class="log-in-form">
+      <h2>Log in to your courses</h2>
+      <form>
+        <div class="row">
+          <label>Email</label>
+          <input name="email" type="email" class="email-field" tabindex="1">
+        </div>
+        <div class="row">
+          <label>Password</label>
+          <input name="password" type="password" class="password-field" tabindex="2">
+        </div>
+        <div class="row 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>
+    <div class="sign-up">
+      <h3>Register for classes</h3>
+      <p>Take free online courses from today's leading universities.</p>
+      <p><a href="#" class="register-button">Register</a></p>
+    </div>
+  </div>
+</div>
+
+</%block>
\ No newline at end of file