mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 12:39:18 +00:00
website updates and fix to sessions
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
{% block content %}
|
||||
<div class="content">
|
||||
<div class="layout-wrapper layout-main">
|
||||
<h3>Page missing or moved</h3>
|
||||
<h3><i class="icon-exclamation-sign"></i> Page missing or moved</h3>
|
||||
<br>
|
||||
<p>We are very sorry for this, but the page you are looking for is missing
|
||||
(this could be because of a typo in the address) or moved.</p>
|
||||
|
||||
@@ -17,11 +17,12 @@
|
||||
<div class="layout-main">
|
||||
<h1>Blog</h1>
|
||||
<br>
|
||||
<div id="blog-list" style="min-height: 400px;">
|
||||
<div id="blog-list">
|
||||
<!-- blog list will be generated dynamically -->
|
||||
</div>
|
||||
<div style="text-align: center;">
|
||||
<button id="next-page" class="btn">More...</button>
|
||||
<button id="next-page" class="btn"
|
||||
style="display:none;">More...</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
11
website/templates/pages/error.html
Normal file
11
website/templates/pages/error.html
Normal file
@@ -0,0 +1,11 @@
|
||||
{% extends "html/outer.html" %}
|
||||
|
||||
{% block content %}
|
||||
<div class="content">
|
||||
<div class="layout-wrapper layout-main">
|
||||
<h3><i class="icon-exclamation-sign"></i> Oops, a server error has occured</h3>
|
||||
<br>
|
||||
<pre>%(error)s</pre>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -56,7 +56,13 @@ $(document).ready(function() {
|
||||
|
||||
}
|
||||
if(data.length < 10) {
|
||||
$(".more-btn").replaceWith("<div class='alert'>Nothing more to show</div>");
|
||||
if(!table) {
|
||||
$(".more-btn")
|
||||
.replaceWith("<div class='alert'>No results found for your search.</div>");
|
||||
} else {
|
||||
$(".more-btn")
|
||||
.replaceWith("<div class='alert'>Nothing more to show.</div>");
|
||||
}
|
||||
} else {
|
||||
$(".more-btn").toggle(true)
|
||||
}
|
||||
@@ -78,8 +84,11 @@ $(document).ready(function() {
|
||||
<div id="search-list">
|
||||
|
||||
</div>
|
||||
<div class="more-btn" style="text-align: middle; display: none;">
|
||||
<button class="btn">More...</button>
|
||||
<div style="text-align: center;">
|
||||
<div class="more-btn"
|
||||
style="display: none; text-align: center;">
|
||||
<button class="btn">More...</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
{% extends "html/page.html" %}
|
||||
|
||||
{% block javascript %}
|
||||
{% include "js/products.js" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block css %}
|
||||
{% include "css/products.css" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block title %}
|
||||
Products
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" id="content-products">
|
||||
|
||||
<div class="layout-main-section">
|
||||
<h1 class="products-category"></h1>
|
||||
<div class="products-search" style="margin-bottom: 15px;">
|
||||
<input name="products-search" />
|
||||
<button class="btn" style="margin-left: 7px">Search</button>
|
||||
</div>
|
||||
<div id="products-list">
|
||||
<!-- product list will be generated dynamically -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layout-side-section">
|
||||
<h3>Categories</h3>
|
||||
<div class="more-categories"></div>
|
||||
</div>
|
||||
<div style="clear: both"></div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user