From 022c65a6b40d572afeefea27fa69475413343267 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 11:40:16 -0400
Subject: [PATCH 1/2] fixed class name header bug

---
 lms/static/sass/base/_extends.scss        | 19 +++++++++++++++++++
 lms/static/sass/course/base/_base.scss    |  4 ++++
 lms/static/sass/course/base/_extends.scss |  5 +++++
 lms/templates/courseware.html             |  1 -
 lms/templates/navigation.html             |  8 ++++----
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss
index 9dc10aed5f..0161610a28 100644
--- a/lms/static/sass/base/_extends.scss
+++ b/lms/static/sass/base/_extends.scss
@@ -89,3 +89,22 @@
   border: 1px solid rgb(6, 65, 18);
   color: rgb(255, 255, 255);
 }
+
+.global {
+  h2 {
+    display: none;
+    float: left;
+    font-size: 0.9em;
+    font-weight: 600;
+    line-height: 40px;
+    letter-spacing: 0;
+    text-transform: none;
+    text-shadow: 0 1px 0 #fff;
+
+    .provider {
+      font: inherit;
+      font-weight: bold;
+      color: #6d6d6d;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index 8d952b5040..cd68b4bbaf 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -1,3 +1,7 @@
+body {
+  min-width: 980px;
+}
+
 body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a {
   font-family: $sans-serif;
 }
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 62a6b25393..418074ee01 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -187,7 +187,12 @@ h1.top-header {
 }
 
 .global {
+  .find-courses-button {
+    display: none;
+  }
+
   h2 {
+    display: block;
     float: left;
     font-size: 0.9em;
     font-weight: 600;
diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index a14f35d154..8811509088 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -1,6 +1,5 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
 <%block name="headextra">
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index f0242f995b..7ba5cca8d0 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -7,16 +7,16 @@
 <header class="global" aria-label="Global Navigation">
   <nav>
     <h1 class="logo"><a href="${reverse('root')}"></a></h1>
-    
+
     %if course:
       <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
-    %else:
-      <ol class="left">
+    %endif
+
+    <ol class="left find-courses-button">
       <li class="primary">
         <a href="${reverse('courses')}">Find Courses</a>
       </li>
     </ol>
-    %endif
 
   %if user.is_authenticated():
     <ol class="user">

From 538185173a1b2b5fa76076703111a91226d655fd Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 11:48:07 -0400
Subject: [PATCH 2/2] added truncation for super long titles

---
 lms/static/sass/base/_extends.scss        | 13 -------------
 lms/static/sass/course/base/_extends.scss |  4 ++++
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss
index 0161610a28..2998e25dca 100644
--- a/lms/static/sass/base/_extends.scss
+++ b/lms/static/sass/base/_extends.scss
@@ -93,18 +93,5 @@
 .global {
   h2 {
     display: none;
-    float: left;
-    font-size: 0.9em;
-    font-weight: 600;
-    line-height: 40px;
-    letter-spacing: 0;
-    text-transform: none;
-    text-shadow: 0 1px 0 #fff;
-
-    .provider {
-      font: inherit;
-      font-weight: bold;
-      color: #6d6d6d;
-    }
   }
 }
\ No newline at end of file
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 418074ee01..7b3e1cba84 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -193,6 +193,7 @@ h1.top-header {
 
   h2 {
     display: block;
+    width: 700px;
     float: left;
     font-size: 0.9em;
     font-weight: 600;
@@ -200,6 +201,9 @@ h1.top-header {
     letter-spacing: 0;
     text-transform: none;
     text-shadow: 0 1px 0 #fff;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 
     .provider {
       font: inherit;