Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into

feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_settings.scss
	cms/templates/settings.html

cms/static/sass/_base.scss

@@ -80,7 +80,8 @@ footer {
 
 input[type="text"],
 input[type="email"],
-input[type="password"] {
+input[type="password"],
+textarea {
     padding: 6px 8px 8px;
     @include box-sizing(border-box);
     border: 1px solid #b0b6c2;

cms/static/sass/_variables.scss

@@ -13,8 +13,11 @@ $body-line-height: golden-ratio(.875em, 1);
 $pink: rgb(182,37,104);
 $error-red: rgb(253, 87, 87);
 
+$offBlack: #3c3c3c;
 $blue: #5597dd;
 $orange: #edbd3c;
+$red: #b20610;
+$green: #108614;
 $lightGrey: #edf1f5;
 $mediumGrey: #ced2db;
 $darkGrey: #8891a1;

cms/static/sass/base-style.scss

@@ -18,6 +18,7 @@
 @import "static-pages";
 @import "users";
 @import "import";
+@import "settings";
 @import "course-info";
 @import "landing";
 @import "graphics";

cms/templates/base.html

@@ -9,6 +9,9 @@
     <%static:css group='base-style'/>
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/skins/simple/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
+
     <title><%block name="title"></%block></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
@@ -33,6 +36,9 @@
     <script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
     <script src="${static.url('js/vendor/jquery.tablednd.js')}"></script>
     <script src="${static.url('js/vendor/jquery.form.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/vendor/symbolset.ss-standard.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/vendor/symbolset.ss-symbolicons.js')}"></script>
+
     <script type="text/javascript">
       document.write('\x3Cscript type="text/javascript" src="' +
           document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');

cms/urls.py

@@ -43,6 +43,7 @@ urlpatterns = ('',
     url(r'^edit_static/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_static', name='edit_static'),
     url(r'^edit_tabs/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_tabs', name='edit_tabs'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
+    url(r'^settings/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.settings', name='settings'),
 
     # temporary landing page for a course
     url(r'^edge/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),