studio - addressing pull request to merge to master feedback

cms/djangoapps/contentstore/views.py

@@ -120,9 +120,11 @@ def howitworks(request):
     else:
         return render_to_response('howitworks.html', {})
 
+
 def ux_alerts(request):
     return render_to_response('ux-alerts.html', {})
 
+
 # ==== Views for any logged-in user ==================================
 
 

cms/static/js/base.js

@@ -48,31 +48,6 @@ $(document).ready(function () {
         (e).preventDefault();
     });
 
-    // alert and notifications - manual close
-    $('.action-alert-close, .alert.has-actions .nav-actions a').click(function(e) {
-        (e).preventDefault();
-        console.log('closing alert');
-        $(this).closest('.wrapper-alert').removeClass('is-shown');
-    });
-
-    // alert and notifications - manual & action-based close
-    $('.action-notification-close').click(function(e) {
-        (e).preventDefault();
-        $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding');
-    });
-
-    // prompt pop
-    $('.action-prompt').click(function(e){
-        (e).preventDefault();
-        $body.toggleClass('prompt-is-shown');
-    });
-
-    // prompt close
-    $('.prompt .action-cancel, .prompt .action-proceed').click(function(e) {
-        (e).preventDefault();
-        $body.removeClass('prompt-is-shown');
-    });
-
     // nav - dropdown related
     $body.click(function (e) {
         $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown');

cms/static/sass/_base.scss

@@ -112,6 +112,7 @@ p, ul, ol, dl {
 
 // layout - basic page header
 .wrapper-mast {
+  margin: ($baseline*1.5) 0 0 0;
   padding: 0 $baseline;
   position: relative;
 
@@ -122,7 +123,7 @@ p, ul, ol, dl {
     max-width: $fg-max-width;
     min-width: $fg-min-width;
     width: flex-grid(12);
-    margin: ($baseline*1.5) auto $baseline auto;
+    margin: 0 auto $baseline auto;
     color: $gray-d2;
   }
 

cms/templates/settings_advanced.html

@@ -42,13 +42,17 @@ editor.render();
 </%block>
 
 <%block name="content">
-<div class="wrapper-content wrapper">
-  <section class="content">
-    <header class="page">
+<div class="wrapper-mast wrapper">
+  <header class="mast has-subtitle">
+    <div class="title">
       <span class="title-sub">Settings</span>
-      <h1 class="title-1">Advanced Settings</h1>
+      <h1 class="title-1">Schedule &amp; Details</h1>
+    </div>
   </header>
+</div>
 
+<div class="wrapper-content wrapper">
+  <section class="content">
     <article class="content-primary" role="main">
       <form id="settings_advanced" class="settings-advanced" method="post" action="">
 

cms/templates/ux-alerts.html

@@ -7,6 +7,31 @@
   // notifications - demo
   $(document).ready(function() {
 
+    // alert and notifications - manual close
+    $('.action-alert-close, .alert.has-actions .nav-actions a').click(function(e) {
+        (e).preventDefault();
+        console.log('closing alert');
+        $(this).closest('.wrapper-alert').removeClass('is-shown');
+    });
+
+    // alert and notifications - manual & action-based close
+    $('.action-notification-close').click(function(e) {
+        (e).preventDefault();
+        $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding');
+    });
+
+    // prompt pop
+    $('.action-prompt').click(function(e){
+        (e).preventDefault();
+        $body.toggleClass('prompt-is-shown');
+    });
+
+    // prompt close
+    $('.prompt .action-cancel, .prompt .action-proceed').click(function(e) {
+        (e).preventDefault();
+        $body.removeClass('prompt-is-shown');
+    });
+
     $('.hide-notification').click(function(e) {
         (e).preventDefault();
         $('.wrapper-notification').removeClass('is-hiding is-shown');

cms/urls.py

@@ -99,7 +99,6 @@ urlpatterns = ('',
 
 # User creation and updating views
 urlpatterns += (
-    url(r'^ux-alerts$', 'contentstore.views.ux_alerts', name='ux-alerts'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/checklists/(?P<name>[^/]+)$', 'contentstore.views.get_checklists', name='checklists'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/checklists/(?P<name>[^/]+)/update(/)?(?P<checklist_index>.+)?.*$',
         'contentstore.views.update_checklist', name='checklists_updates'),
@@ -117,6 +116,8 @@ urlpatterns += (
 
     url(r'^logout$', 'student.views.logout_user', name='logout'),
 
+    # static/proof-of-concept views
+    url(r'^ux-alerts$', 'contentstore.views.ux_alerts', name='ux-alerts')
     )
 
 if settings.ENABLE_JASMINE: