From 13882b7544d8ec2c01dbceffe0bfcdc264fc18ab Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 25 Sep 2014 12:04:39 -0400
Subject: [PATCH] adding copy revisions and light styling support for cohort
 management

---
 .../sass/course/instructor/_instructor_2.scss |  4 ++++
 .../instructor_dashboard/membership.html      | 22 +++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index 2271f145cd..518c6ac0e0 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -595,10 +595,14 @@ section.instructor-dashboard-content-2 {
 
     .setup-value {
       float: left;
+      width: 70%;
+      margin-right: 5%;
     }
 
     .setup-actions {
       float: right;
+      width: 20%;
+      text-align: right;
     }
   }
 
diff --git a/lms/templates/ux/reference/instructor_dashboard/membership.html b/lms/templates/ux/reference/instructor_dashboard/membership.html
index 1ac98dffa8..4de3dff1b0 100644
--- a/lms/templates/ux/reference/instructor_dashboard/membership.html
+++ b/lms/templates/ux/reference/instructor_dashboard/membership.html
@@ -353,7 +353,7 @@
 
             <!-- create/edit cohort group messages -->
             <div class="message message-confirmation is-shown">
-                <h3 class="message-title">New Cohort Name has been created. You may add students below.</h3>
+                <h3 class="message-title">New Cohort Name has been created. You can manually add students to this group below.</h3>
             </div>
 
             <div class="message message-error is-shown">
@@ -373,7 +373,19 @@
                     <div class="cohort-management-group-setup">
                         <h4 class="sr">This cohort group's current management set up:</h4>
                         <div class="setup-value">
-                            Students are added to this group automatically
+                            Students are added to this group automatically.
+                            <a href="" class="incontext-help action-secondary action-help">What does this mean?</a>
+                        </div>
+
+                        <div class="setup-actions">
+                            <a href="" class="action-secondary action-edit">Edit settings in Studio</a>
+                        </div>
+                    </div>
+
+                    <div class="cohort-management-group-setup">
+                        <h4 class="sr">This cohort group's current management set up:</h4>
+                        <div class="setup-value">
+                            Students are added to this group only when you provide their email addresses or usernames on this page.
                             <a href="" class="incontext-help action-secondary action-help">What does this mean?</a>
                         </div>
 
@@ -390,7 +402,7 @@
                         <h4 class="form-title">Add students to this cohort group</h4>
 
                         <div class="form-introduction">
-                            <p>Please Note: Adding a student to this group will remove them from any groups they are currently  a part of.</p>
+                            <p>Note: Students can only be in one cohort group. Adding students to this group overrides any previous group assignment.</p>
                         </div>
 
                         <!-- individual group - form message - confirmation -->
@@ -428,11 +440,13 @@
                         <div class="form-fields">
                             <div class="field field-textarea is-required">
                                 <label for="cohort-management-group-add-students" class="label">
-                                    Student ID or Email Address of Students to be added (one per line or comma-separated) *
+                                    Enter email addresses and/or usernames separated by new lines or commas for students to add. *
                                     <span class="sr">(Required Field)</span>
                                 </label>
 
                                 <textarea name="cohort-management-group-add-students" id="cohort-management-group-add-students" class="input cohort-management-group-add-students" placeholder="e.g. johndoe@example.com, JaneDoe, joeydoe@example.com" required="required"></textarea>
+
+                                <span class="tip">You will not get notification for emails that bounce, so please double-check spelling.</span>
                             </div>
                         </div>