Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "LMS: Fixed views for article and video"

Browse Source 
This reverts commit 9b7585405f7e25dcdcba4e131066d6b57a1d8899.
This commit is contained in:
scmmishra 2018-10-18 16:06:18 +05:30 committed by Aditya Hase
parent 1e10fc43f4
commit 5569cbf82c
5 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/www/lms/course.html
View File

@ -1,7 +1,6 @@
{% extends "frappe_theme/templates/base.html" %}
{% block title %}ERPNext Academy{% endblock %}
{% from "templates/includes/media.html" import media %}
<<<<<<< HEAD
{% block head_include %}
<meta name="description" content="ERPNext Academy is a learnig platform to gain expertise in the world's top 100% open source ERP software." />
<meta name="keywords" content="ERP Software, Cloud ERP, Open Source ERP, Accounting Software, Online ERP, Online Accounting, ERP for small business, Learn ERP, ERPNext Academy, Learn ERPNext, Learn Accounting" />
@ -11,11 +10,6 @@
{% with content = current_content, next_content = next_content, course_name = course_name, program_name = program_name %}
{% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
{% endwith %}
=======
{% block content %}
<div id="content-holder" data-type="{{ content_type }}" data-content="{{ current_content.name }}" data-course="{{ course_name }}" data-program="{{ program_name }}">
{% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
>>>>>>> LMS: Fixed views for article and video
</div>
<style>
.footer-message {

5
erpnext/www/lms/program.html
View File

@ -1,6 +1,11 @@
{% extends "frappe_theme/templates/base.html" %}
{% block title %}ERPNext Academy{% endblock %}
{% block head_include %}
<meta name="description" content="ERPNext Academy is a learnig platform to gain expertise in the world's top 100% open source ERP software." />
<meta name="keywords" content="ERP Software, Cloud ERP, Open Source ERP, Accounting Software, Online ERP, Online Accounting, ERP for small business, Learn ERP, ERPNext Academy, Learn ERPNext, Learn Accounting" />
{% endblock %}
{% macro course_card(course) %}
<div class="card mt-3" data-list="getting-started">
<div class='card-body'>

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

@ -2,7 +2,6 @@
<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 }}
@ -12,15 +11,6 @@
{% 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>
@ -29,19 +19,12 @@
<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

9
erpnext/www/lms/templates/includes/quiz.html
View File

@ -41,9 +41,12 @@
<h3>Your Score: <span id="result"></span></h3>
</div>
<div class="col-md-4 text-right">
{% with next_content = next_content, course_name = course_name, program_name = program_name %}
{% include "www/lms/templates/includes/lms-nav.html" %}
{% endwith %}
<a class='btn btn-outline-secondary' href="#">Previous</a>
{% if next_content != None %}
<a class='btn btn-primary' href="/lms/course?program={{ program }}&course={{ course_name }}&content={{ next_content }}">Next</a>
{% else %}
<a class='btn btn-primary' href="/lms/program?program={{ program }}">Finish Course</a>
{% endif %}
</div>
</div>
</div>

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

@ -1,31 +1,18 @@
<section class='video-top-section video-section-bg'>
<div class='container'>
<div class="embed-responsive embed-responsive-16by9">
<<<<<<< HEAD
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/{{ content.url.split('v=')[1].split('&')[0] }}" allowfullscreen></iframe>
=======
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/{{ current_content.url.split('v=')[1].split('&')[0] }}" allowfullscreen></iframe>
>>>>>>> LMS: Fixed views for article and video
</div>
<div class="mt-3 row">
<div class="col-md-8">
<h2>{{ content.name }}</h2>
<span class="text-muted">
<<<<<<< HEAD
<i class="octicon octicon-clock" title="Duration"></i> {{ content.duration }} Mins
&mdash; Published on {{ content.publish_date }}.
</span>
</div>
<div class="col-md-4 text-right">
{% with next_content = next_content, course_name = course_name, program_name = program_name %}
=======
<i class="octicon octicon-clock" title="Duration"></i> {{ current_content.duration }} Mins
&mdash; Published on {{ current_content.publish_date }}.
</span>
</div>
<div class="col-md-4 text-right">
{% with %}
>>>>>>> LMS: Fixed views for article and video
{% include "www/lms/templates/includes/lms-nav.html" %}
{% endwith %}
</div>
@ -36,11 +23,7 @@
<section class="video-description-section">
<div class='container'>
<div class="content">
<<<<<<< HEAD
{{ content.description }}
=======
{{ current_content.description }}
>>>>>>> LMS: Fixed views for article and video
</div>
<div class="text-right hidden">
<a class='btn btn-outline-secondary' href="/classrooms/module">Previous</a>