From f22793f91b31ad1e7c3e038a7001f5c57bc2c1cd Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 30 May 2019 16:34:53 +0530 Subject: [PATCH] refactor: added program card macro --- erpnext/www/lms/all-programs.html | 29 +++-------------------------- erpnext/www/lms/index.html | 28 +++------------------------- erpnext/www/lms/macros/card.html | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 51 deletions(-) create mode 100644 erpnext/www/lms/macros/card.html diff --git a/erpnext/www/lms/all-programs.html b/erpnext/www/lms/all-programs.html index f5b7595ec8..088498b4a9 100644 --- a/erpnext/www/lms/all-programs.html +++ b/erpnext/www/lms/all-programs.html @@ -1,5 +1,6 @@ {% extends "templates/base.html" %} {% block title %}All Programs{% endblock %} +{% from "www/lms/macros/card.html" import program_card %} {% block head_include %} {% endblock %} - -{% macro card(program, is_enrolled) %} -
- -
- {% if program.hero_image %} -
- {% else %} -
-
{{ program.program_name }}
-
- {% endif %} -
-
{{ program.program_name }}
-
{{ program.description }}
-
- -
-
-
-{% endmacro %} - {% block content %}
{% for program in all_programs %} - {{ card(program.program, program.is_enrolled) }} + {{ program_card(program) }} {% endfor %}
diff --git a/erpnext/www/lms/index.html b/erpnext/www/lms/index.html index ffa46e123c..ba3034c79e 100644 --- a/erpnext/www/lms/index.html +++ b/erpnext/www/lms/index.html @@ -1,5 +1,6 @@ {% extends "templates/base.html" %} {% block title %}{{ education_settings.portal_title }}{% endblock %} +{% from "www/lms/macros/card.html" import program_card %} {% block head_include %} @@ -32,43 +33,20 @@ {% endblock %} -{% macro card(program) %} - -{% endmacro %} - {% block content %}

{{ education_settings.portal_title }}

{{ education_settings.description }}

- Start Learning + {{ 'Start Learning' if frappe.session.user == 'Guest' else 'Explore Programs'}}

Go to erpnext.com
{% for program in featured_programs %} - {{ card(program.program) }} + {{ program_card(program) }} {% endfor %}

diff --git a/erpnext/www/lms/macros/card.html b/erpnext/www/lms/macros/card.html new file mode 100644 index 0000000000..8cf8a78e56 --- /dev/null +++ b/erpnext/www/lms/macros/card.html @@ -0,0 +1,22 @@ +{% macro program_card(program) %} +

+{% endmacro %} \ No newline at end of file