mirror of
https://github.com/erpnext/foundation.git
synced 2026-10-16 18:00:47 +02:00
Update inner pages
- Fellow page if now cards based - update blog detail page - over ride chapters list page - add avatar css - update breadcrumb - remove unecessary paddings from pages - fix type in bootstrap js include - over ride list template - update about page and service providers page - update jobs page - add spacing to footer copyright section - temporarily remove webform templates (TODO - needs fix)
This commit is contained in:
Raghavendra Kamath
@@ -45,7 +45,7 @@
|
||||
<script type="text/javascript"
|
||||
src="/assets/js/frappe-web.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
|
||||
<script src="assets/bootstrap-4/js/bootstrap.min.js"></script>
|
||||
<script src="/assets/bootstrap-4/js/bootstrap.min.js"></script>
|
||||
{% endblock %}
|
||||
{%- if js_globals is defined %}
|
||||
<script>
|
||||
|
||||
19
foundation/templates/includes/blog/blog.html
Normal file
19
foundation/templates/includes/blog/blog.html
Normal file
@@ -0,0 +1,19 @@
|
||||
{% extends "templates/web.html" %}
|
||||
|
||||
{% block title %}{{ blog_title or _("Blog") }}{% endblock %}
|
||||
{% block header %}<h1>{{ blog_title or _("Blog") }}</h1>{% endblock %}
|
||||
{% block hero %}{% endblock %}
|
||||
|
||||
{% block page_content %}
|
||||
<!-- no-header -->
|
||||
<!-- no-breadcrumbs -->
|
||||
<div class="blog-list-content">
|
||||
<div id="blog-list">
|
||||
{% include "templates/includes/list/list.html" %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block script %}
|
||||
<script>{% include "templates/includes/list/list.js" %}</script>
|
||||
{% endblock %}
|
||||
13
foundation/templates/includes/blog/blogger.html
Normal file
13
foundation/templates/includes/blog/blogger.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<div class="row mt-4">
|
||||
<div class="col-xs-12 col-sm-1">
|
||||
<div class="avatar avatar-large">
|
||||
<img itemprop="thumbnailUrl" src="{{ blogger_info.avatar or "/assets/frappe/images/default-avatar.png" }}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-8">
|
||||
<h4 class="text-muted">
|
||||
<a href="/blog?blogger={{ blogger_info.name }}">{{ blogger_info.full_name }}</a>
|
||||
</h4>
|
||||
<p class="text-muted">{%if blogger_info.bio %}{{ blogger_info.bio }}{% endif %}</p>
|
||||
</div>
|
||||
</div>
|
||||
12
foundation/templates/includes/blog/hero.html
Normal file
12
foundation/templates/includes/blog/hero.html
Normal file
@@ -0,0 +1,12 @@
|
||||
{% if blog_title and not (frappe.local.form_dict.txt or frappe.local.form_dict.by) %}
|
||||
<div class="page-hero border-bottom">
|
||||
<div class="container">
|
||||
<h1 class="page-title">
|
||||
{{ blog_title }}
|
||||
</h1>
|
||||
{% if blog_introduction -%}
|
||||
<p class="blog-introduction">{{ blog_introduction }}</p>
|
||||
{%- endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -3,7 +3,7 @@
|
||||
{% for parent in parents %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ url_prefix }}{{ parent.route | abs_url }}" itemprop="url">
|
||||
<span itemprop="title">{{ parent.title or parent.label or parent.name or "" }}</span>
|
||||
<span itemprop="title">{{ parent.title or parent.label or parent.name or "" }} </span>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pt-3 mt-3 border-top">
|
||||
<div class="py-3 mt-3 border-top">
|
||||
<span>© <span id="year"></span> ERPNext Open Source Software Foundation. Content licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank"> CC-BY-SA 3.0</a> Read the <a href="/terms" >Terms of use</a>.</span>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
|
||||
26
foundation/templates/includes/list/list.html
Normal file
26
foundation/templates/includes/list/list.html
Normal file
@@ -0,0 +1,26 @@
|
||||
{% if sub_title %}
|
||||
<h4 class="text-muted">{{ sub_title }}</h4>
|
||||
{% endif %}
|
||||
{% if not result -%}
|
||||
<div class="text-muted no-results" style="min-height: 300px;">
|
||||
<i class="mega-octicon octicon-telescope"></i>
|
||||
{{ no_result_message or _("Nothing to show") }}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="website-list" data-doctype="{{ doctype }}"
|
||||
data-txt="{{ txt or '[notxt]' }}">
|
||||
<!-- {% if not hide_filters -%}
|
||||
{% include "templates/includes/list/filters.html" %}
|
||||
{%- endif %} -->
|
||||
{% if result_heading_template %}{% include result_heading_template %}{% endif %}
|
||||
|
||||
<div class="row result">
|
||||
{% for item in result %}
|
||||
{{ item }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="more-block mb-4 {% if not show_more -%} hide {%- endif %}">
|
||||
<button class="btn btn-more btn-secondary">{{ _("More") }}</button>
|
||||
</div>
|
||||
</div>
|
||||
{%- endif %}
|
||||
@@ -1,4 +1,4 @@
|
||||
<nav class="navbar navbar-expand-lg" role="navigation">
|
||||
<nav class="navbar navbar-expand-lg border-bottom" role="navigation">
|
||||
<a class="navbar-brand ellipsis"
|
||||
href="{{ url_prefix }}{{ home_page or "/"}}">
|
||||
<span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span>
|
||||
|
||||
@@ -1,55 +1,53 @@
|
||||
{% extends base_template_path %}
|
||||
{% block hero %}{% endblock %}
|
||||
{% block content %}
|
||||
<div class="page px-3 pt-3">
|
||||
<div class="row" id="page-{{ name or route }}"
|
||||
data-path="{{ pathname }}" {%- if page_or_generator=="Generator" %} data-doctype="{{ doctype }}"{% endif %}>
|
||||
{% if show_sidebar %}
|
||||
<div class="pt-3 col-sm-2 border-right">
|
||||
{% include "templates/includes/web_sidebar.html" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="{% if show_sidebar %}pt-3 col-sm-10{% else %} col-sm-12 {% endif %}">
|
||||
<div class="page-content-wrapper px-3">
|
||||
<div class="row page-head">
|
||||
<div class='col-sm-12'>
|
||||
{% if not no_breadcrumbs and parents %}
|
||||
<div class="page-breadcrumbs">
|
||||
{% block breadcrumbs %}
|
||||
{% include 'templates/includes/breadcrumbs.html' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if doctype != 'Blog Post' %}
|
||||
<div class="col-sm-8 col-xs-6">
|
||||
{% block header %}{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="col-sm-4 col-xs-6">
|
||||
{% if show_search %}
|
||||
<div class="page-search-block">
|
||||
{% block search %}
|
||||
{% include
|
||||
'templates/includes/search_box.html' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="page">
|
||||
<div class="row" id="page-{{ name or route }}" data-path="{{ pathname }}" {%- if page_or_generator=="Generator" %} data-doctype="{{ doctype }}"{% endif %}>
|
||||
{% if show_sidebar %}
|
||||
<div class="pt-4 col-sm-2 border-right">
|
||||
{% include "templates/includes/web_sidebar.html" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="pt-3 {% if show_sidebar %}px-3 col-sm-10{% else %} col-sm-12 {% endif %}">
|
||||
<div class="page-content-wrapper">
|
||||
<div class="row page-head">
|
||||
<div class='col-sm-12'>
|
||||
{% if not no_breadcrumbs and parents %}
|
||||
<div class="page-breadcrumbs">
|
||||
{% block breadcrumbs %}
|
||||
{% include 'templates/includes/breadcrumbs.html' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if doctype != 'Blog Post' %}
|
||||
<div class="col-sm-8 col-xs-6">
|
||||
{% block header %}{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="col-sm-4 col-xs-6">
|
||||
{% if show_search %}
|
||||
<div class="page-search-block">
|
||||
{% block search %}
|
||||
{% include
|
||||
'templates/includes/search_box.html' %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if self.header_actions() %}
|
||||
<div class="page-header-actions-block">
|
||||
{% block header_actions %}{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="page_content">
|
||||
{%- block page_content -%}{%- endblock -%}
|
||||
</div>
|
||||
</div>
|
||||
<!-- sidebar ends -->
|
||||
</div>
|
||||
</div>
|
||||
{% if self.header_actions() %}
|
||||
<div class="page-header-actions-block">
|
||||
{% block header_actions %}{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="page_content">
|
||||
{%- block page_content -%}{%- endblock -%}
|
||||
</div>
|
||||
</div>
|
||||
<!-- sidebar ends -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user