From 722c5bb90dc9711870362cbcd1dc61aa9600a5e0 Mon Sep 17 00:00:00 2001 From: Ahsan Ulhaq Date: Tue, 18 Aug 2015 17:42:03 +0500 Subject: [PATCH] Style issues on the credit status in the dashboard ECOM-2117 --- lms/static/js/dashboard/credit.js | 2 +- lms/static/sass/multicourse/_dashboard.scss | 25 +++++++++++-------- .../dashboard/_dashboard_credit_info.html | 5 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lms/static/js/dashboard/credit.js b/lms/static/js/dashboard/credit.js index 2173ffc792..71c7733671 100644 --- a/lms/static/js/dashboard/credit.js +++ b/lms/static/js/dashboard/credit.js @@ -31,7 +31,7 @@ 'username': username }; $.ajax({ - url: 'api/credit/v1/provider/' + provider_id + '/request/', + url: 'api/credit/v1/providers/' + provider_id + '/request/', type: 'POST', headers: { 'X-CSRFToken': $.cookie('csrftoken') diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index cafc33646a..3066cc570c 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -548,16 +548,7 @@ padding: 0; } - .credit-eligibility-msg { - @include float(left); - margin-top: 10px; - } - - .purchase_credit { - @include float(right); - } - - .pending-credit-btn{ + .credit-btn{ @include float(right); } @@ -758,6 +749,20 @@ font-weight: bold; } } + .credit-eligibility-msg { + @include float(left); + margin-top: 10px; + } + + .credit-request-pending-msg { + @include float(left); + margin-top: 10px; + } + + .credit-request-approved-msg{ + width: flex-grid(10, 12); + @include float(left); + } .actions { diff --git a/lms/templates/dashboard/_dashboard_credit_info.html b/lms/templates/dashboard/_dashboard_credit_info.html index 2b47712de7..9eceea6daa 100644 --- a/lms/templates/dashboard/_dashboard_credit_info.html +++ b/lms/templates/dashboard/_dashboard_credit_info.html @@ -22,6 +22,7 @@ % if not credit_status["purchased"] and not credit_status["error"] :

${_("You are now eligible for credit. Congratulations!")} +

${_("Get credit")} @@ -54,12 +55,12 @@

## 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. Congratulations. Please see {link_to_provider_site} for more information.").format( + ${_("Your credit has been processed and approved. Congratulations!. Please see {link_to_provider_site} for more information.").format( link_to_provider_site=provider_link, ) }

- ${_("Access credit")} + ${_("Access credit")} % elif credit_status["request_status"] == "rejected" and not credit_status["error"] :

## Translators: link_to_provider_site is a link to an external webpage. The text of the link will be the name of a