From 65b8bf8c400ae1fc72594f587cb10707ff575264 Mon Sep 17 00:00:00 2001
From: Ahsan Ulhaq <ahsan.haq@arbisoft.com>
Date: Wed, 30 Sep 2015 00:17:09 +0500
Subject: [PATCH] Messaging and text improvements

ECOM-2338
---
 lms/static/sass/multicourse/_dashboard.scss   |  2 +-
 .../dashboard/_dashboard_credit_info.html     | 34 ++++++++-----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 2c293b3b80..dc538a3c4c 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -752,7 +752,7 @@
           }
           .credit-eligibility-msg {
             @include float(left);
-            margin-top: 10px;
+            width: flex-grid(10, 12);
           }
 
           .credit-request-pending-msg {
diff --git a/lms/templates/dashboard/_dashboard_credit_info.html b/lms/templates/dashboard/_dashboard_credit_info.html
index 9eceea6daa..26ed9244dd 100644
--- a/lms/templates/dashboard/_dashboard_credit_info.html
+++ b/lms/templates/dashboard/_dashboard_credit_info.html
@@ -21,59 +21,55 @@
         </p>
     % if not credit_status["purchased"] and not credit_status["error"] :
         <p class="message-copy credit-eligibility-msg">
-            ${_("You are now eligible for credit. <b>Congratulations!</b>")}
+            ${_("You have completed this course and are eligible to purchase course credit. Select <b>Learn More</b> to get started.")}
 
         </p>
         <div class="purchase_credit">
-            <a class="btn credit-btn purchase-credit-btn" href="${settings.ECOMMERCE_PUBLIC_URL_ROOT}/credit/checkout/${credit_status['course_key']}" target="_blank" data-course-key="${credit_status['course_key']}">${_("Get credit")}</a>
+            <a class="btn credit-btn purchase-credit-btn" href="${settings.ECOMMERCE_PUBLIC_URL_ROOT}/credit/checkout/${credit_status['course_key']}" target="_blank" data-course-key="${credit_status['course_key']}">${_("Learn More")}</a>
         </div>
     % elif credit_status["request_status"] in [None, "pending"] and not credit_status["error"] :
         % if credit_status["request_status"] == "pending":
             <p class="message-copy credit-request-pending-msg">
-                ## Translators: link_to_provider_site is a link to an external webpage. The text of the link will be the name of a
-                ## credit provider, such as 'State University' or 'Happy Fun Company'
-                ${_("Thank you. Your credit is processing. Please see {link_to_provider_site} for more information.").format(
-                        link_to_provider_site=provider_link,
+                ## Translators: provider_name is the name of a credit provider, such as 'State University' or 'Happy Fun Company'.
+                ${_("{provider_name} has received your course credit request. We will update you when credit processing is complete.").format(
+                        provider_name=credit_status["provider_name"],
                     )
                 }
             </p>
-            <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Learn more")}</button>
         % elif credit_status["request_status"] is None:
             <p class="message-copy credit-request-pending-msg">
                 ## Translators: link_to_provider_site is a link to an external webpage. The text of the link will be the name of a
-                ## credit provider, such as 'State University' or 'Happy Fun Company'
-                ${_("Thank you for your purchase. Please proceed to {link_to_provider_site} to finalize your credit.").format(
+                ## credit provider, such as 'State University' or 'Happy Fun Company'.
+                ${_("Thank you for your payment. To receive course credit, you must now request credit at the {link_to_provider_site}  website. Select <b>Request Credit</b> to get started.").format(
                         link_to_provider_site=provider_link,
                     )
                 }
             </p>
-            <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Finalize credit")}</button>
+            <button class="btn credit-btn pending-credit-btn" data-course-key="${credit_status['course_key']}" data-user="${user.username}" data-provider="${credit_status['provider_id']}">${_("Request Credit")}</button>
         % endif
 
         <form id="credit-pending-form"> </form>
     % elif credit_status["request_status"] == "approved" and not credit_status["error"] :
         <p class="message-copy credit-request-approved-msg">
             ## Translators: link_to_provider_site is a link to an external webpage. The text of the link will be the name of a
-            ## credit provider, such as 'State University' or 'Happy Fun Company'
-            ${_("Your credit has been processed and approved. <b>Congratulations!</b>. Please see {link_to_provider_site} for more information.").format(
+            ## credit provider, such as 'State University' or 'Happy Fun Company'. provider_name is the name of credit provider.
+            ${_("<b>Congratulations!</b> {provider_name} has approved your request for course credit. To see your course credit, visit the {link_to_provider_site} website").format(
+                    provider_name=credit_status["provider_name"],
                     link_to_provider_site=provider_link,
                 )
             }
         </p>
-        <a class="btn credit-btn access-credit-btn" href="${credit_status['provider_status_url']}" target="_blank">${_("Access credit")}</a>
+        <a class="btn credit-btn access-credit-btn" href="${credit_status['provider_status_url']}" target="_blank">${_("View Credit")}</a>
     % elif credit_status["request_status"] == "rejected" and not credit_status["error"] :
         <p class="message-copy credit-request-rejected-msg">
             ## Translators: link_to_provider_site is a link to an external webpage. The text of the link will be the name of a
-            ## credit provider, such as 'State University' or 'Happy Fun Company'
-            ${_("Your credit has been processed but denied. Please contact {link_to_provider_site} for more information.").format(
+            ## credit provider, such as 'State University' or 'Happy Fun Company'. provider_name is the name of credit provider.
+            ${_("{provider_name} did not approve your request for course credit. For more information, contact {link_to_provider_site} directly.").format(
+                    provider_name=credit_status["provider_name"],
                     link_to_provider_site=provider_link,
                 )
             }
         </p>
-        <a class="btn credit-btn denied-credit-btn" href="${credit_status['provider_status_url']}" target="_blank">
-            ${_("Contact {provider}").format(provider=u'credit_status["provider_name"]')
-        }
-        </a>
     % endif
     </div>
 % endif