From 0a2b74110e0af91e995c540e88ecf111e4c4a43e Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 12 Feb 2013 17:03:48 -0500
Subject: [PATCH] studio - nav and soft landing various QA fixes

---
 cms/static/client_templates/course_grade_policy.html |  8 ++++----
 cms/static/sass/_account.scss                        |  8 ++++++++
 cms/static/sass/_header.scss                         |  4 +---
 cms/static/sass/_index.scss                          |  3 +--
 cms/static/sass/_settings.scss                       | 12 ++++++++++--
 cms/templates/login.html                             |  2 +-
 cms/templates/widgets/footer.html                    |  2 +-
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/cms/static/client_templates/course_grade_policy.html b/cms/static/client_templates/course_grade_policy.html
index 639bee3d9b..db129614f6 100644
--- a/cms/static/client_templates/course_grade_policy.html
+++ b/cms/static/client_templates/course_grade_policy.html
@@ -6,26 +6,26 @@
   </div>
 
   <div class="field text" id="field-course-grading-assignment-shortname">
-    <label for="course-grading-shortname">Abbreviation:</label>
+    <label for="course-grading-assignment-shortname">Abbreviation:</label>
     <input type="text" class="short" id="course-grading-assignment-shortname" value="<%= model.get('short_label') %>" /> 
     <span class="tip tip-inline">e.g. HW, Midterm</span>
   </div>
   
   <div class="field text" id="field-course-grading-assignment-gradeweight">
-    <label for="course-grading-gradeweight">Weight of Total Grade</label>
+    <label for="course-grading-assignment-gradeweight">Weight of Total Grade</label>
     <input type="text" class="short" id="course-grading-assignment-gradeweight" value = "<%= model.get('weight') %>" /> 
     <span class="tip tip-inline">e.g. 25%</span>
   </div>
   
   <div class="field text" id="field-course-grading-assignment-totalassignments">
-    <label for="course-grading-gradeweight">Total
+    <label for="course-grading-assignment-totalassignments">Total
 			Number</label>
     <input type="text" class="short" id="course-grading-assignment-totalassignments" value = "<%= model.get('min_count') %>" /> 
     <span class="tip tip-inline">total exercises assigned</span>
   </div>
   
   <div class="field text" id="field-course-grading-assignment-droppable">
-    <label for="course-grading-gradeweight">Number of
+    <label for="course-grading-assignment-droppable">Number of
 			Droppable</label>
     <input type="text" class="short" id="course-grading-assignment-droppable" value = "<%= model.get('drop_count') %>" />
     <span class="tip tip-inline">total exercises that won't be graded</span>
diff --git a/cms/static/sass/_account.scss b/cms/static/sass/_account.scss
index 81771557f0..650743979f 100644
--- a/cms/static/sass/_account.scss
+++ b/cms/static/sass/_account.scss
@@ -145,6 +145,13 @@ body.signup, body.signin {
             :-ms-input-placeholder {  
                color: $gray-l3; 
             }
+
+            &:focus {
+
+              + .tip {
+                color: $gray;
+              }
+            }
           }
 
           textarea.long {
@@ -163,6 +170,7 @@ body.signup, body.signin {
           }
 
           .tip {
+            @include transition(color, 0.15s, ease-in-out);
             @include font-size(13);
             display: block;
             margin-top: ($baseline/4);
diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index eac712c4e5..68e1efc0b1 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -53,9 +53,6 @@
   float: right;
 }
 
-// general nav styles
-// ====================
-
 // ====================
 
 // specific elements - branding
@@ -515,6 +512,7 @@ body.course.export .nav-course-tools-export,
 
   a {
     color: $blue;
+    pointer-events: none;
   }
 }
 
diff --git a/cms/static/sass/_index.scss b/cms/static/sass/_index.scss
index 9d1f111218..8a4ca4a0a4 100644
--- a/cms/static/sass/_index.scss
+++ b/cms/static/sass/_index.scss
@@ -240,7 +240,6 @@
               margin-right: flex-gutter();
               padding: ($baseline*0.75) $baseline;
               color: $gray-l1;
-              cursor: pointer;
 
               .title {
                 @include font-size(16);
@@ -254,7 +253,7 @@
                 background: $blue-l5;
                 top: -($baseline/5);
 
-                .title, strong {
+                .title {
                   color: $blue;
                 }
               }
diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index 6df5a56b08..d25c78f35b 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -47,6 +47,7 @@ body.course.settings {
 
     // UI hints/tips/messages
     .tip {
+      @include transition(color, 0.15s, ease-in-out);
       @include font-size(13);
       display: block;
       margin-top: ($baseline/4);
@@ -127,6 +128,13 @@ body.course.settings {
           &.error {
             border-color: $red;
           }
+
+          &:focus {
+
+            + .tip {
+              color: $gray;
+            }
+          }
         }
 
         textarea.long {
@@ -157,10 +165,10 @@ body.course.settings {
           @include box-sizing(border-box);
           @include border-radius(3px);
           background: $gray-l5;
-          padding: ($baseline/2);
+          padding: $baseline;
 
           &:last-child {
-            padding-bottom: ($baseline/2); 
+            padding-bottom: $baseline; 
           }
 
           .actions {
diff --git a/cms/templates/login.html b/cms/templates/login.html
index 920ea57758..0ff55d1cc2 100644
--- a/cms/templates/login.html
+++ b/cms/templates/login.html
@@ -46,7 +46,7 @@
 
       <div class="bit">
         <h3 class="title-3">Need Help?</h3>
-        <p>Having trouble with your account? Use <a href="" rel="external">our support center</a> to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.</p>
+        <p>Having trouble with your account? Use <a href="http://help.edge.edx.org" rel="external">our support center</a> to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.</p>
       </div>
     </aside>
   </section>
diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index b73c2b7376..0f265dfc2c 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -18,7 +18,7 @@
           <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
         </li>
         <li class="nav-item nav-peripheral-contact">
-          <a href="#">Contact edX</a>
+          <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
         </li>
         
         % if user.is_authenticated():