:

This PR addresses the following
- Updated CSS to match UI design
- Changed the tags around for <main> and <nav> because they were reversed
- Added a condition in base template to apply a different layout for dashboard vs the rest of the app

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 18:07+0500\n"
+"POT-Creation-Date: 2017-06-02 14:58+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: apps/api/filters.py
 #, python-brace-format
@@ -2575,17 +2575,17 @@ msgid ""
 msgstr ""
 
 #: templates/publisher/dashboard.html
-msgid "Add a New Course"
+msgid ""
+"EdX Publisher is a companion to edX Studio. Course teams enter About page "
+"information in Publisher, and course content in Studio."
 msgstr ""
 
 #: templates/publisher/dashboard.html
-msgid "Add a Course Run"
+msgid "Add a New Course"
 msgstr ""
 
 #: templates/publisher/dashboard.html
-msgid ""
-"EdX Publisher is a companion to edX Studio. Course teams enter About page "
-"information in Publisher, and course content in Studio."
+msgid "Add a Course Run"
 msgstr ""
 
 #: templates/publisher/dashboard.html

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 18:07+0500\n"
+"POT-Creation-Date: 2017-06-02 14:58+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: static/js/catalogs-change-form.js
 msgid "Preview"

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 18:07+0500\n"
+"POT-Creation-Date: 2017-06-02 14:58+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps/api/filters.py
@@ -3044,14 +3044,6 @@ msgstr ""
 " ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αт#"
 
 #: templates/publisher/dashboard.html
-msgid "Add a New Course"
-msgstr "Àdd ä Néw Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
-
-#: templates/publisher/dashboard.html
-msgid "Add a Course Run"
-msgstr "Àdd ä Çöürsé Rün Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
-
-#: templates/publisher/dashboard.html
 msgid ""
 "EdX Publisher is a companion to edX Studio. Course teams enter About page "
 "information in Publisher, and course content in Studio."
@@ -3060,6 +3052,14 @@ msgstr ""
 "ïnförmätïön ïn Püßlïshér, änd çöürsé çöntént ïn Stüdïö. Ⱡ'σ#"
 
 #: templates/publisher/dashboard.html
+msgid "Add a New Course"
+msgstr "Àdd ä Néw Çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
+#: templates/publisher/dashboard.html
+msgid "Add a Course Run"
+msgstr "Àdd ä Çöürsé Rün Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
+#: templates/publisher/dashboard.html
 msgid "Course runs"
 msgstr "Çöürsé rüns Ⱡ'σяєм ιρѕυм ∂σłσя #"
 

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-01 18:07+0500\n"
+"POT-Creation-Date: 2017-06-02 14:58+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/js/catalogs-change-form.js

course_discovery/static/sass/_build.scss

@@ -22,8 +22,10 @@
 // #EXTENSIONS
 // ------------------------------
 @import "base";
-@import "publisher/lib";
 @import 'publisher/color-palette';
+@import "publisher/lib";
+@import 'publisher/layout';
+@import 'publisher/grid';
 @import 'publisher/typography';
 @import 'publisher/buttons-links';
 @import 'publisher/navigations';

course_discovery/static/sass/publisher/color-palette.scss

-$light-gray: rgba(204, 204, 204, 1);
+$white:				#fff;
+
+$gray-border: 		#e5e5e5;
+
+$dark-blue: 		#34495E;
+
+$active-blue:		#00A0E3;
+
+$light-gray: 		rgba(204, 204, 204, 1);
+
+$gray-background: 	#ECF0F1;
+
+$nav-active:		#243342;
+
+$nav-color:			#dbe2e2;
+
+$tab-default:		#474747;
+$tab-border:		#DEE1E2;
\ No newline at end of file

course_discovery/static/sass/publisher/dashboard.scss

+.about-and-add-buttons{
+  @include padding(1em, 1.5em, 1em, 1.5em);
+  background: $white
+}
+
 .publisher-container {
   @include margin(0, 0, 0, 0);
-    @include padding-left(5px);
+  @include padding(1em, 1.5em, 1em, 1.5em);
   font-family: "Open Sans", Arial, Helvetica, sans-serif;
 
   .studio-instance-success {
@@ -15,6 +20,26 @@
   }
 
   .filters {
-      margin-bottom: 10px;
+      margin: 1em 0;
   }
 }
+
+.btn-filter{
+  background: #e5e5e5;
+  color: #646464;
+
+  & .filter-count{
+    color: #646464;
+  }
+
+  &.active{
+    background: $active-blue;
+    border-color: #0491CB;
+
+      & .filter-count{
+        color: #0491CB;
+      }
+  }
+
+}
+

course_discovery/static/sass/publisher/grid.scss

+.col-60{
+	width: 60%;
+}
+
+.col-40{
+	width: 40%;
+}
+

course_discovery/static/sass/publisher/layout.scss

+//main-ltr is adding a height of 100%
+html
+, body{
+	height: auto;
+}
+
+body{
+	background: $dark-blue;
+}
+
+header{
+	background: $white;
+}
+
+.layout-col-b{
+	background: $gray-background;
+}
+
+//at the momment main-ltr is adding a margin of 20px at the bottom of the div
+.container .wrapper-footer{
+	margin: 0 !important;
+	background: $white;
+}
+

course_discovery/static/sass/publisher/lib.scss

@@ -9,6 +9,13 @@
   }
 }
 
+.float-left{ 
+  @include float(left); 
+}
+.float-right{ 
+  @include float(right); 
+}
+
 .margin-top20 {
     margin-top: 20px;
     margin-bottom: 10px;
@@ -19,11 +26,11 @@
 }
 
 .border-left {
-    @include border-left(1px solid);
+    @include border-left(0px solid);
 }
 
 .border-top {
-    border-top: 1px solid;
+    border-top: 1px solid $gray-border;
 }
 
 .actions {

course_discovery/static/sass/publisher/navigations.scss

@@ -2,21 +2,26 @@
 // MAIN NAV
 // --------
 .menu-list {
+
+    margin-top: 0.5em;
+
     .item {
-        border-bottom: 2px solid $white;
+        border-bottom: 0px solid $white;
         margin-bottom: 0;
         padding-bottom: 0;
 
         a {
+            color: $nav-color;
+            font-size: 0.9375em;
             width: 100%;
             height: 100%;
-            background: $light-gray;
+            background: transparent;
             border: 0;
             border-radius: 0;
             text-decoration: none;
 
             &.active {
-                background: palette(primary, accent);
+                background: $nav-active;
                 color: $white;
             }
         }
@@ -240,11 +245,9 @@
 // -----------
 
 .breadcrumb {
-  @include padding(8px, 5px, 8px, 5px);
+  @include padding(0, 0, 0, 0);
   @include margin(0, 0, 0, 0);
   list-style: none;
-  background: white;
-  border-radius: 3px;
 
   > li {
     display: inline-block;

course_discovery/static/sass/publisher/publisher.scss

 
+.layout-full{
+  @include padding(1em, 1em, 1em, 1em);
+  background: $white;
+}
 
 .course-detail {
     @include margin(0px, 0px, 0px, 0px);
@@ -21,6 +25,7 @@
         @include margin-left(0);
         @include margin-right(0);
         max-width: 100%;
+        @include padding(0,0,0,0);
 
         .layout-col-menu {
             @include margin-left(0);
@@ -30,21 +35,29 @@
         }
 
         .layout-col-container {
-            @include padding(20px, 20px, 20px, 20px);
+            @include padding(1em, 1.5em, 1em, 1.5em);
             @include margin-right(0);
             width: 88%;
         }
 
-        
+        .layout-col-container-dashboard{
+          width: 88%;
+          margin: 0;
+        }
 
         .layout-col-a-custom {
-            @include margin-left(0);
-            width: 45%;
+            @include margin-left(3%);
+            width: 37%;
         }
 
         .layout-col-b-custom {
             @include margin-right(0);
             width: 55%;
+            background: $white;
+            padding-top: 1em;
+            padding-bottom: 1em;
+            @include padding-right(2.5%);
+            @include padding-left(2.5%);
         }
     }
 
@@ -453,15 +466,6 @@
     display: inline-block;
 }
 
-.about-publisher {
-    max-width: 60%;
-}
-
-.about-and-button {
-    display: -webkit-box;
-}
-
-
 #id_organization {
   width: auto;
 }

course_discovery/static/sass/publisher/tabs.scss

@@ -15,18 +15,18 @@
       @include padding(12px, 20px, 12px, 20px);
       @include margin-right(1px);
       @include float(left);
-      background: #f2f2f2;
+      background: transparent;
       margin-bottom: 0 !important;
       position: relative;
       text-align: center;
       font-weight: 600;
       font-size: 15px;
-      color: #949494;
+      color: $tab-default;
       text-transform: capitalize;
       text-decoration: none;
       z-index: 999;
       border: {
-        width: 2px;
+        width: 0px;
         style: solid;
         color: #f2f2f2;
         bottom-width: 0;
@@ -41,12 +41,12 @@
       &.is-active {
         cursor: default;
         background: white;
-        color: #169bd5;
+        color: $active-blue;
         z-index: 1001;
         border: {
-          width: 2px;
+          width: 1px;
           style: solid;
-          color: #169bd5;
+          color: $tab-border;
           bottom-width: 0;
         }
 
@@ -89,7 +89,7 @@
   .tab-panel {
     @include padding(20px, 20px, 20px, 20px);
     display: none;
-    border: 2px solid #169bd5;
+    border: 1px solid $tab-border;
     background-color: #fff;
     margin-bottom: 50px;
     outline: none;

course_discovery/templates/publisher/base.html

@@ -16,7 +16,7 @@
     <div class="container">
         {% include 'publisher/_header.html' %}
         <div class="layout-1q3q layout-flush border-top">
-            <main class="layout-col layout-col-a layout-col-menu">
+            <nav class="layout-col layout-col-a layout-col-menu">
                 <ul class="list-divided menu-list">
                     <li class="item">
                         {% url 'publisher:publisher_dashboard' as dashboard_url %}
@@ -32,14 +32,22 @@
                         </a>
                     </li>
                 </ul>
-            </main>
+            </nav>
+
+            
+
+        {% if request.path == dashboard_url %}
+            <main class="layout-col layout-col-b border-left layout-col-container-dashboard">
+        {% else %}
+            <main class="layout-col layout-col-b border-left layout-col-container">
+        {% endif %}
 
-            <aside class="layout-col layout-col-b border-left layout-col-container">
                 {% block breadcrumbs %}
                     {% include 'publisher/_breadcrumbs.html' %}
                 {% endblock %}
-                {% block page_content %}{% endblock %}
-            </aside>
+                {% block page_content %}
+                {% endblock %}
+            </main>
 
         </div>
 

course_discovery/templates/publisher/dashboard.html

@@ -7,10 +7,15 @@
 {% endblock title %}
 
 {% block page_content %}
-    <div class="publisher-container">
+    <div class="about-and-add-buttons clearfix">
+
         <h2 class="hd-2 emphasized">{% trans "COURSE ABOUT PAGES" %}</h2>
-        <div class="about-and-button">
+    
+        <div class="col-60 float-left">
             <p class="about-publisher">{% trans "EdX Publisher is used to create course About pages. Users enter, review, and approve content in Publisher. Publisher keeps track of the details and sends email updates when actions are necessary." %}</p>
+            <p>{% trans "EdX Publisher is a companion to edX Studio. Course teams enter About page information in Publisher, and course content in Studio." %}</p>
+        </div>
+        <div class="col-40 float-left">
             <a href="{% url 'publisher:publisher_courses_new' %}" class="btn btn-brand btn-add-course">
                 {% trans "Add a New Course" %}
             </a>
@@ -18,7 +23,9 @@
                 {% trans "Add a Course Run" %}
             </a>
         </div>
-        <p>{% trans "EdX Publisher is a companion to edX Studio. Course teams enter About page information in Publisher, and course content in Studio." %}</p>
+
+    </div>
+    <div class="publisher-container">
         {% with studio_count=studio_request_courses|length published_count=published_course_runs|length preview_count=preview_course_runs|length in_progress_count=in_progress_course_runs|length %}
         <h2 class="hd-2 emphasized course-runs-heading">{% trans "Course runs" %}</h2>
         <ul role="tablist" class="tabs">