Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed template loader webnotes/wnframework#351

Browse Source
This commit is contained in:
Rushabh Mehta 2013-12-12 13:57:58 +05:30
parent 1b23208779
commit d2dd83c3a3
18 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html
View File

@ -1,4 +1,4 @@
{% extends "app/portal/templates/sale.html" %}
{% extends "portal/templates/sale.html" %}
{% block status -%}
{% if doc.status %}{{ doc.status }}{% endif %}

2
erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html
View File

@ -1 +1 @@
{% extends "app/portal/templates/sales_transactions.html" %}
{% extends "portal/templates/sales_transactions.html" %}

4
erpnext/portal/templates/base.html
View File

@ -1,3 +1,3 @@
{% extends "lib/website/templates/base.html" %}
{% extends "website/templates/base.html" %}
{% block footer %}{% include "app/portal/templates/includes/footer.html" %}{% endblock %}
{% block footer %}{% include "portal/templates/includes/footer.html" %}{% endblock %}

2
erpnext/portal/templates/includes/footer.html
View File

@ -1,4 +1,4 @@
{% extends "lib/website/templates/includes/footer.html" %}
{% extends "website/templates/includes/footer.html" %}
{% block powered %}<a href="http://erpnext.org" style="color: #aaa;">ERPNext Powered</a>{% endblock %}

2
erpnext/portal/templates/pages/cart.html
View File

@ -1,7 +1,7 @@
{% extends base_template %}
{% block javascript %}
<script>{% include "app/portal/templates/includes/cart.js" %}</script>
<script>{% include "portal/templates/includes/cart.js" %}</script>
{% endblock %}
{% set title="Shopping Cart" %}

2
erpnext/portal/templates/sales_transactions.html
View File

@ -1,4 +1,4 @@
{% extends "app/portal/templates/includes/transactions.html" %}
{% extends "portal/templates/includes/transactions.html" %}
{% block javascript -%}
<script>

2
erpnext/selling/doctype/sales_order/templates/pages/order.html
View File

@ -1,4 +1,4 @@
{% extends "app/portal/templates/sale.html" %}
{% extends "portal/templates/sale.html" %}
{% block status -%}
{% if doc.status %}{{ doc.status }}{% endif %}

2
erpnext/selling/doctype/sales_order/templates/pages/orders.html
View File

@ -1 +1 @@
{% extends "app/portal/templates/sales_transactions.html" %}
{% extends "portal/templates/sales_transactions.html" %}

8
erpnext/setup/doctype/item_group/templates/generators/item_group.html
View File

@ -1,11 +1,11 @@
{% extends base_template %}
{% block content %}
{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
{% include 'stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
<div class="container content">
{% if slideshow %}<!-- slideshow -->
{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
{% include "website/doctype/website_slideshow/templates/includes/slideshow.html" %}
{% endif %}
{% if description %}<!-- description -->
<div itemprop="description">{{ description or ""}}</div>
@ -42,7 +42,7 @@
$(function() {
if(window.logged_in && getCookie("system_user")==="yes") {
wn.has_permission("Item Group", "{{ name }}", "write", function(r) {
wn.require("lib/js/wn/website/editable.js");
wn.require("js/wn/website/editable.js");
wn.make_editable($('[itemprop="description"]'), "Item Group", "{{ name }}", "description");
});
}

4
erpnext/startup/event_handlers.py
View File

@ -64,10 +64,6 @@ def check_if_expired():
webnotes.response['message'] = 'Account Expired'
raise webnotes.AuthenticationError
def on_build():
from home.page.latest_updates import latest_updates
latest_updates.make()
def comment_added(doc):
"""add comment to feed"""
home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,

2
erpnext/stock/doctype/delivery_note/templates/pages/shipment.html
View File

@ -1 +1 @@
{% extends "app/portal/templates/sale.html" %}
{% extends "portal/templates/sale.html" %}

2
erpnext/stock/doctype/delivery_note/templates/pages/shipments.html
View File

@ -1 +1 @@
{% extends "app/portal/templates/sales_transactions.html" %}
{% extends "portal/templates/sales_transactions.html" %}

14
erpnext/stock/doctype/item/templates/generators/item.html
View File

@ -2,12 +2,12 @@
{% block javascript %}
<script>
{% include "app/stock/doctype/item/templates/includes/product_page.js" %}
{% include "stock/doctype/item/templates/includes/product_page.js" %}
$(function() {
if(window.logged_in && getCookie("system_user")==="yes") {
wn.has_permission("Item", "{{ name }}", "write", function(r) {
wn.require("lib/js/wn/website/editable.js");
wn.require("js/wn/website/editable.js");
wn.make_editable($('[itemprop="description"]'), "Item", "{{ name }}", "web_long_description");
});
}
@ -17,25 +17,25 @@
{% block css %}
<style>
{% include "app/stock/doctype/item/templates/includes/product_page.css" %}
{% include "stock/doctype/item/templates/includes/product_page.css" %}
</style>
{% endblock %}
{% block content %}
{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
{% include 'stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
<div class="container content product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col-md-6">
{% if slideshow %}
{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
{% include "website/doctype/website_slideshow/templates/includes/slideshow.html" %}
{% else %}
{% if website_image %}
<image itemprop="image" class="item-main-image"
src="{{ website_image }}" />
{% else %}
<div class="img-area">
{% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
{% include 'stock/doctype/item/templates/includes/product_missing_image.html' %}
</div>
{% endif %}
{% endif %}

2
erpnext/stock/doctype/item/templates/includes/product_in_grid.html
View File

@ -4,7 +4,7 @@
{%- if website_image -%}
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
{%- else -%}
{% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
{% include 'stock/doctype/item/templates/includes/product_missing_image.html' %}
{%- endif -%}
</a>
</div>

2
erpnext/stock/doctype/item/templates/includes/product_in_list.html
View File

@ -5,7 +5,7 @@
{%- if website_image -%}
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
{%- else -%}
{% include 'app/website/templates/html/product_missing_image.html' %}
{% include 'website/templates/html/product_missing_image.html' %}
{%- endif -%}
</a>
</div>

4
erpnext/stock/doctype/item/templates/pages/product_search.html
View File

@ -3,7 +3,7 @@
{% set title="Product Search" %}
{% block javascript %}
<script>{% include "app/stock/doctype/item/templates/includes/product_list.js" %}</script>
<script>{% include "stock/doctype/item/templates/includes/product_list.js" %}</script>
{% endblock %}
{% block content %}
@ -17,7 +17,7 @@ $(document).ready(function() {
});
</script>
{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %}
{% include "stock/doctype/item/templates/includes/product_search_box.html" %}
<div class="container content">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">

2
erpnext/support/doctype/support_ticket/templates/pages/tickets.html
View File

@ -1,4 +1,4 @@
{% extends "app/portal/templates/includes/transactions.html" %}
{% extends "portal/templates/includes/transactions.html" %}
{% block javascript -%}
{{ super() }}

19
erpnext/translations/languages.json
View File

@ -1,19 +0,0 @@
{
"中国（简体）": "zh-cn",
"中國（繁體）": "zh-tw",
"deutsch": "de",
"ελληνικά": "el",
"english": "en",
"español": "es",
"français": "fr",
"हिंदी": "hi",
"hrvatski": "hr",
"italiano": "it",
"nederlands": "nl",
"português brasileiro": "pt-BR",
"português": "pt",
"српски":"sr",
"தமிழ்": "ta",
"ไทย": "th",
"العربية":"ar"
}