nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

LMS: Fixed views for article and video

Browse Source
This commit is contained in:
scmmishra
2018-10-18 15:44:08 +05:30
committed by Aditya Hase
parent 590227b107
commit 1e10fc43f4
5 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/www/lms/templates/includes/article.html
View File

@@ -2,6 +2,7 @@
<div class='container'>
<div class="row">
<div class="col-md-8">
<<<<<<< HEAD
<h2>{{ content.title }}</h2>
<span class="text-muted">
Published on {{ content.publish_date }}, by {{ content.author }}
@@ -11,6 +12,15 @@
{% with next_content = next_content, course_name = course_name, program_name = program_name %}
{% include "www/lms/templates/includes/lms-nav.html" %}
{% endwith %}
=======
<h2>{{ current_content.title }}</h2>
<span class="text-muted">
Published on {{ current_content.publish_date }}, by {{ current_content.author }}
</span>
</div>
<div class="col-md-4 text-right">
{% include "www/lms/templates/includes/lms-nav.html" %}
>>>>>>> LMS: Fixed views for article and video
</div>
</div>
<hr>
@@ -19,12 +29,19 @@
<section class="article-content-section">
<div class='container'>
<div class="content">
<<<<<<< HEAD
{{ content.content }}
</div>
<div class="text-right">
{% with next_content = next_content, course_name = course_name, program_name = program_name %}
{% include "www/lms/templates/includes/lms-nav.html" %}
{% endwith %}
=======
{{ current_content.content }}
</div>
<div class="text-right">
{% include "www/lms/templates/includes/lms-nav.html" %}
>>>>>>> LMS: Fixed views for article and video
</div>
<div class="mt-3 text-right">
<a class="text-muted" href="/report"><i class="octicon octicon-issue-opened" title="Report"></i> Report a