Merge branch 'bootstrap-4' of github.com:erpnext/foundation into bootstrap-4

This commit is contained in:
Raghavendra Kamath
2018-04-27 11:33:52 +05:30
3 changed files with 33 additions and 27 deletions

View File

@@ -1,5 +1,5 @@
{% if doc.published %}
<div class="col-xs-12 col-sm-6 mb-4">
<div class="col-xs-12 col-sm-12 mb-4">
<div class="card">
<div class="card-body">
<h4 class="card-title">{{ doc.feature_name }}</h4>
@@ -29,7 +29,7 @@
{% endif %}
</p>
<p class="card-text">{{ html2text(doc.description[:200]) }}{% if doc.description|len > 200 %}...{% endif %}</p>
<a href={{ route }}> Read More Details</a>
<a href={{ route }}>Details</a>
</div>
</div>
</div>

View File

@@ -1,4 +1,5 @@
<div class="card mx-3" style="width: 100%; margin-bottom: 1rem;">
<div class="mb-4 col-xs-12 col-sm-12">
<div class="card">
<div class="card-body">
<a href="/{{ doc.route }}"><h5 class="card-title">{{ doc.title }}</h5></a>
<h6 class="card-subtitle mb-2 text-muted">{{ doc.country }}, {{ frappe.format_date(doc.creation) }} | {{ doc.job_type }}, {{ doc.status }}</h6>
@@ -6,3 +7,4 @@
<!-- <a href="/{{ doc.route }}" class="card-link">Details</a> -->
</div>
</div>
</div>

View File

@@ -1,8 +1,11 @@
{% if doc.published %}
<div class="mb-4 col-xs-12 col-sm-12">
<h3>{{ doc.name | capitalize }}</h3>
<p> <span class="label"> Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }} </span>
<span class="label">
<div class="card">
<div class="card-body">
<a href={{ route }}><h5 class="card-title">{{ doc.name | capitalize }}</h5></a>
<h6 class="card-subtitle mb-2 text-muted">Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }}</h6>
<p class="card-text">
{% if members %}
{% set index = [] %}
{% for user in members %}
@@ -14,10 +17,11 @@
{% else %}
Members: 0
{% endif %}
</span>
<!-- Assignment of value to global variable not working in jinja -->
</p>
<p>{{ html2text(doc.introduction) | truncate (200) }}</p>
<a href={{ route }}>Read More Details </a>
<p class="card-text">{{ html2text(doc.introduction) | truncate (200) }}</p>
<!-- <a href="/{{ doc.route }}" class="card-link">Details</a> -->
</div>
</div>
</div>
{% endif %}