Cleanup docs and login

This commit is contained in:
Raghavendra Kamath
2018-02-13 16:45:24 +05:30
parent 5eded58ae7
commit ef03c035b9
13 changed files with 660 additions and 71 deletions

View File

@@ -16,8 +16,24 @@
{% endblock %}
{%- block head -%}
{% block meta_block %}{% endblock %}
<link href="assets/foundation/css/erpnext-org-theme.css" rel="stylesheet">
<link href="/assets/foundation/css/erpnext-org-theme.css" rel="stylesheet">
{% if 'docs' in path %}
<link type="text/css" rel="stylesheet" href="/docs/assets/css/hljs.css">
<link type="text/css" rel="stylesheet" href="/docs/assets/css/font-awesome.css">
<link type="text/css" rel="stylesheet" href="/docs/assets/css/octicons/octicons.css">
<link type="text/css" rel="stylesheet" href="/docs/assets/css/docs.css">
{% endif %}
{%- endblock -%}
{# loading required JS for login #}
<script>
window.frappe = {};
frappe.ready_events = [];
frappe.ready = function(fn) {
frappe.ready_events.push(fn);
}
window.dev_server = {{ dev_server }};
</script>
{# loading required JS for login #}
</head>
<body data-path="{{ path }}">
<div class="wrapper">
@@ -27,5 +43,29 @@
{% endblock %}
{%- block footer -%}{% include "foundation/templates/includes/footer/footer.html" %}{%- endblock -%}
</div>
{# loading required JS for login #}
{% if path == 'login' or 'docs' in path %}
{% block base_scripts %}
<!-- js should be loaded in body! -->
<script type="text/javascript"
src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
<script type="text/javascript"
src="/assets/frappe/js/frappe-web.min.js"></script>
{% endblock %}
{%- if js_globals is defined %}
<script>
{%- for key, value in js_globals.iteritems() %}
window.{{ key }} = "{{ value[0] }}";
{%- endfor -%}
</script>
{% endif -%}
{%- for link in web_include_js %}
<script type="text/javascript" src="{{ link|abs_url }}"></script>
{%- endfor -%}
{%- block script %}{%- endblock %}
<!-- csrf_token -->
{%- block body_include %}{{ body_include or "" }}{% endblock -%}
{% endif %}
</body>
</html>

View File

@@ -1,6 +1,6 @@
<footer class="footer">
<div class="container">
<div class="row clearfix">
<div class="footer-row clearfix">
<div class="columned">
<h3 class="footer-title">Domains</h3>
<ul class="list-unstyled footer-list">
@@ -11,7 +11,7 @@
<a class="secondary-link" href="/docs/user/manual/en/stock">Distribution</a>
</li>
<li>
<a class="secondary-link" href="docs/user/manual/en/projects">Services</a>
<a class="secondary-link" href="/docs/user/manual/en/projects">Services</a>
</li>
<li>
<a class="secondary-link" href="/docs/user/manual/en/accounts/point-of-sale-pos-invoice">Retail</a>
@@ -20,13 +20,13 @@
<a class="secondary-link" href="/docs/user/manual/en/schools">Education</a>
</li>
<li>
<a class="secondary-link" href="docs/user/manual/en/healthcare">Healthcare</a>
<a class="secondary-link" href="/docs/user/manual/en/healthcare">Healthcare</a>
</li>
<li>
<a class="secondary-link" href="docs/user/manual/en/agriculture">Agriculture</a>
<a class="secondary-link" href="/docs/user/manual/en/agriculture">Agriculture</a>
</li>
<li>
<a class="secondary-link" href="docs/user/manual/en/non_profit">Non Profit</a>
<a class="secondary-link" href="/docs/user/manual/en/non_profit">Non Profit</a>
</li>
</ul>
</div>
@@ -113,14 +113,14 @@
</ul>
</div>
</div>
<div class="social">
<div class="social centered">
<p>Find us on
<a class="secondary-link" href="https://twitter.com/erpnext" target="_blank">Twitter</a>,
<a class="secondary-link" href="https://www.facebook.com/ERPNext/" target="_blank">Facebook</a> &
<a class="secondary-link" href="https://medium.com/frappé-thoughts/" target="_blank">Medium</a>
</p>
</div>
<div class="copyright">
<div class="copyright centered">
<p> &copy;<span id="year"></span> ERPNext Open Source Software Foundation.Content licensed under <a class="secondary-link" href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank"> CC-BY-SA 3.0</a>. Read the <a href="/terms" class="secondary-link">terms of use</a>.
</p>
</div>

View File

@@ -0,0 +1,53 @@
{% extends base_template_path %}
{% block hero %}{% endblock %}
{% block content %}
<div class="page">
<div class="page-container" id="page-{{ name or route }}"
data-path="{{ pathname }}" {%- if page_or_generator=="Generator" %} data-doctype="{{ doctype }}"{% endif %}>
{% if show_sidebar %}
<div class="sidebar-block">
{% include "templates/includes/web_sidebar.html" %}
</div>
{% endif %}
<div class="{% if show_sidebar %}page-content with-sidebar{% else %}page-content without-sidebar{% 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>
<div class="col-sm-8 col-xs-6">
{% block header %}{% endblock %}
</div>
<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>
</div>
{% endblock %}