Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
722c5bb9
Commit
722c5bb9
authored
Aug 18, 2015
by
Ahsan Ulhaq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style issues on the credit status in the dashboard
ECOM-2117
parent
3bf6b9bd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
+19
-13
lms/static/js/dashboard/credit.js
+1
-1
lms/static/sass/multicourse/_dashboard.scss
+15
-10
lms/templates/dashboard/_dashboard_credit_info.html
+3
-2
No files found.
lms/static/js/dashboard/credit.js
View file @
722c5bb9
...
...
@@ -31,7 +31,7 @@
'username'
:
username
};
$
.
ajax
({
url
:
'api/credit/v1/provider/'
+
provider_id
+
'/request/'
,
url
:
'api/credit/v1/provider
s
/'
+
provider_id
+
'/request/'
,
type
:
'POST'
,
headers
:
{
'X-CSRFToken'
:
$
.
cookie
(
'csrftoken'
)
...
...
lms/static/sass/multicourse/_dashboard.scss
View file @
722c5bb9
...
...
@@ -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
{
...
...
lms/templates/dashboard/_dashboard_credit_info.html
View file @
722c5bb9
...
...
@@ -22,6 +22,7 @@
% 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>
")}
</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>
...
...
@@ -54,12 +55,12 @@
<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(
${_("Your credit has been processed and approved.
<b>
Congratulations
!
</b>
. Please see {link_to_provider_site} for more information.").format(
link_to_provider_site=provider_link,
)
}
</p>
<a
class=
"btn 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"
>
${_("Access 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment