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
2d1bb9bf
Commit
2d1bb9bf
authored
Feb 28, 2017
by
Ahsan Ulhaq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hidden html sontent on the dashboard are rendered
ECOM-6977
parent
b2385424
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
37 deletions
+45
-37
common/djangoapps/student/views.py
+4
-0
lms/templates/dashboard.html
+22
-20
themes/edx.org/lms/templates/dashboard.html
+19
-17
No files found.
common/djangoapps/student/views.py
View file @
2d1bb9bf
...
...
@@ -800,6 +800,9 @@ def dashboard(request):
else
:
redirect_message
=
''
valid_verification_statuses
=
[
'approved'
,
'must_reverify'
,
'pending'
,
'expired'
]
display_sidebar_on_dashboard
=
len
(
order_history_list
)
or
verification_status
in
valid_verification_statuses
context
=
{
'enrollment_message'
:
enrollment_message
,
'redirect_message'
:
redirect_message
,
...
...
@@ -833,6 +836,7 @@ def dashboard(request):
'show_program_listing'
:
ProgramsApiConfig
.
current
()
.
show_program_listing
,
'disable_courseware_js'
:
True
,
'display_course_modes_on_dashboard'
:
enable_verified_certificates
and
display_course_modes_on_dashboard
,
'display_sidebar_on_dashboard'
:
display_sidebar_on_dashboard
,
}
ecommerce_service
=
EcommerceService
()
...
...
lms/templates/dashboard.html
View file @
2d1bb9bf
...
...
@@ -155,27 +155,29 @@ from openedx.core.djangolib.markup import HTML, Text
<div
id=
"dashboard-search-results"
class=
"search-results dashboard-search-results"
></div>
% endif
<div
class=
"profile-sidebar"
id=
"profile-sidebar"
role=
"region"
aria-label=
"Account Status Info"
>
<header
class=
"profile"
>
<h2
class=
"account-status-title sr"
>
${_("Account Status Info")}:
</h2>
</header>
<div
class=
"user-info"
>
<ul>
% if len(order_history_list):
<li
class=
"order-history"
>
<span
class=
"title"
>
${_("Order History")}
</span>
% for order_history_item in order_history_list:
<span><a
href=
"${order_history_item['receipt_url']}"
target=
"_blank"
class=
"edit-name"
>
${order_history_item['order_date']}
</a></span>
% endfor
</li>
% endif
<
%
include
file=
"${static.get_template_path('dashboard/_dashboard_status_verification.html')}"
/>
</ul>
</div>
% if display_sidebar_on_dashboard:
<div
class=
"profile-sidebar"
id=
"profile-sidebar"
role=
"region"
aria-label=
"Account Status Info"
>
<header
class=
"profile"
>
<h2
class=
"account-status-title sr"
>
${_("Account Status Info")}:
</h2>
</header>
<div
class=
"user-info"
>
<ul>
% if len(order_history_list):
<li
class=
"order-history"
>
<span
class=
"title"
>
${_("Order History")}
</span>
% for order_history_item in order_history_list:
<span><a
href=
"${order_history_item['receipt_url']}"
target=
"_blank"
class=
"edit-name"
>
${order_history_item['order_date']}
</a></span>
% endfor
</li>
% endif
<
%
include
file=
"${static.get_template_path('dashboard/_dashboard_status_verification.html')}"
/>
</ul>
</div>
</div>
% endif
</div>
</main>
...
...
themes/edx.org/lms/templates/dashboard.html
View file @
2d1bb9bf
...
...
@@ -173,27 +173,29 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers
</div>
% endif
<section
class=
"profile-sidebar"
id=
"profile-sidebar"
role=
"region"
aria-label=
"Account Status Info"
>
<header
class=
"profile"
>
<h2
class=
"account-status-title sr"
>
${_("Account Status Info")}:
</h2>
</header>
<section
class=
"user-info"
>
<ul>
% if display_sidebar_on_dashboard:
<section
class=
"profile-sidebar"
id=
"profile-sidebar"
role=
"region"
aria-label=
"Account Status Info"
>
<header
class=
"profile"
>
<h2
class=
"account-status-title sr"
>
${_("Account Status Info")}:
</h2>
</header>
<section
class=
"user-info"
>
<ul>
% if len(order_history_list):
<li
class=
"order-history"
>
<span
class=
"title"
>
${_("Order History")}
</span>
% for order_history_item in order_history_list:
<span><a
href=
"${order_history_item['receipt_url']}"
target=
"_blank"
class=
"edit-name"
>
${order_history_item['order_date']}
</a></span>
% endfor
</li>
% endif
% if len(order_history_list):
<li
class=
"order-history"
>
<span
class=
"title"
>
${_("Order History")}
</span>
% for order_history_item in order_history_list:
<span><a
href=
"${order_history_item['receipt_url']}"
target=
"_blank"
class=
"edit-name"
>
${order_history_item['order_date']}
</a></span>
% endfor
</li>
% endif
<
%
include
file=
"${theming_helpers.get_template_path('dashboard/_dashboard_status_verification.html')}"
/>
<
%
include
file=
"${theming_helpers.get_template_path('dashboard/_dashboard_status_verification.html')}"
/>
</ul>
</ul>
</section>
</section>
</section>
% endif
</section>
<section
id=
"email-settings-modal"
class=
"modal"
aria-hidden=
"true"
>
...
...
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