Changes 3
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index 34d345f..dabbf48 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -2,33 +2,25 @@
{% block title %} {{ title }} {% endblock %}
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block header_actions %}
-{% include 'templates/includes/product_search_box.html' %}
-{% endblock %}
-
{% block breadcrumbs %}
{% include "templates/includes/breadcrumbs.html" %}
{% endblock %}
{% block page_content %}
{% from "erpnext/templates/includes/macros.html" import product_image %}
-<div class="item-content">
+<div class="item-content" style="margin-top:20px;">
<div class="product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
- <div class="col-sm-5">
+ <div class="col-sm-6">
{% if slideshow %}
{% include "templates/includes/slideshow.html" %}
{% else %}
{{ product_image(website_image, "product-full-image") }}
{% endif %}
</div>
- <div class="col-sm-7">
- <!-- <h3 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h3> -->
- <div itemprop="description">
- {{ web_long_description or description or _("No description given") }}
- </div>
+ <div class="col-sm-6" style="padding-left:20px;">
+ <h2 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h2>
+
<p class="text-muted">
{{ _("Item Code") }}: <span itemprop="productID">{{ variant and variant.name or name }}</span></p>
<br>
@@ -77,15 +69,24 @@
</div>
</div>
</div>
- {% if website_specifications -%}
- <div class="row item-website-specification" style="margin-top: 20px">
+ <div class="row item-website-description" style="margin-top:30px; margin-bottom:20px">
<div class="col-md-12">
- <h4>{{ _("Specifications") }}</h4>
+ <h4>{{ _("DESCRIPTION") }}</h4>
+ <div itemprop="description" class="item-desc">
+ {{ web_long_description or description or _("No description given") }}
+ </div>
+ </div>
+ </div>
+
+ {% if website_specifications -%}
+ <div class="row item-website-specification" style="margin-top: 40px">
+ <div class="col-md-12">
+ <h4>{{ _("SPECIFICATIONS") }}</h4>
- <table class="table table-bordered" style="width: 100%">
+ <table class="table borderless" style="width: 100%">
{% for d in website_specifications -%}
<tr>
- <td style="width: 30%;">{{ d.label }}</td>
+ <td class="product-label text-muted" style="width: 30%;">{{ d.label }}</td>
<td>{{ d.description }}</td>
</tr>
{%- endfor %}
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 7e68bc7..195b3c5 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -1,11 +1,18 @@
{% extends "templates/web.html" %}
-{% block header_actions %}
+{#{% block header_actions %}
{% include 'templates/includes/product_search_box.html' %}
-{% endblock %}
-
+{% endblock %}#}
+{% block header %}<h1>{{ _("Products") }}</h1>{% endblock %}
{% block breadcrumbs %}
- {% include "templates/includes/breadcrumbs.html" %}
+ <div class="page-breadcrumbs" data-html-block="breadcrumbs">
+ <ul class="breadcrumb">
+ <li>
+ <span class="icon icon-angle-left"></span>
+ <a href="/me">My Account</a>
+ </li>
+ </ul>
+ </div>
{% endblock %}
{% block page_content %}
@@ -38,16 +45,4 @@
{% endif %}
</div>
</div>
-{% endblock %}
-
-{% block style %}
-<style>
- .product-image.missing-image {
- border: 1px dashed {{ theme.border_color or "#d1d8dd" }};
- }
-
- .product-image.missing-image .octicon {
- color: {{ theme.border_color or "#d1d8dd" }};
- }
-</style>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/footer/footer_extension.html b/erpnext/templates/includes/footer/footer_extension.html
index 69953ab..e32e13d 100644
--- a/erpnext/templates/includes/footer/footer_extension.html
+++ b/erpnext/templates/includes/footer/footer_extension.html
@@ -4,7 +4,7 @@
style="display: inline-block; max-width: 50%;margin-right:15px;"
placeholder="{{ _('Your email address') }}...">
<button class="btn btn-default btn-sm btn-subscribe" type="button"
- id="footer-subscribe-button" style="float:right; border-radius:8px; border:1px solid #78D6FF; color:#78D6FF; background-color:white;">{{ _("Get Updates") }}</button>
+ id="footer-subscribe-button" style="float:right; border-radius:8px; border:1px solid #7575ff; color:#7575ff; background-color:white;">{{ _("Get Updates") }}</button>
<script>
frappe.ready(function() {
diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css
index 8c83e17..e4aa81b 100644
--- a/erpnext/templates/includes/projects.css
+++ b/erpnext/templates/includes/projects.css
@@ -4,12 +4,6 @@
text-decoration: underline;
}
-.page-container {
- font-weight: normal;
- margin: 50px auto;
- max-width: 700px;
-}
-
.project-item:hover {
background-color: #f7f7f7;
}
diff --git a/erpnext/templates/includes/projects/project_row.html b/erpnext/templates/includes/projects/project_row.html
index fcd0e22..55b02e2 100644
--- a/erpnext/templates/includes/projects/project_row.html
+++ b/erpnext/templates/includes/projects/project_row.html
@@ -2,11 +2,11 @@
<div class="web-list-item">
<a class="no-decoration" href="/projects?project={{ doc.name }}">
<div class="row">
- <div class="col-xs-4">
+ <div class="col-xs-6">
{{ doc.name }}
</div>
- <div class="col-xs-4">
+ <div class="col-xs-3">
{% if doc.percent_complete %}
<div class="progress" style="margin-bottom: 0!important; margin-top: 10px!important; height:5px;">
<div class="progress-bar progress-bar-{{ "warning" if doc.percent_complete|round < 100 else "success"}}" role="progressbar"
@@ -19,7 +19,7 @@
{{ doc.status }}</span>
{% endif %}
</div>
- <div class="col-xs-4 text-right small text-muted">
+ <div class="col-xs-3 text-right small text-muted">
{{ frappe.utils.pretty_date(doc.modified) }}
</div>
</div>
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index bf1514a..d390ebf 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -8,6 +8,7 @@
def get_context(context):
context.no_cache = 1
+ context.show_sidebar = True
context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
if hasattr(context.doc, "set_indicator"):
context.doc.set_indicator()
diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html
index 6ecdfb6..1cac25e 100644
--- a/erpnext/templates/pages/projects.html
+++ b/erpnext/templates/pages/projects.html
@@ -3,11 +3,15 @@
{% block title %}{{ doc.project_name }}{% endblock %}
{%- from "templates/includes/projects/macros.html" import back_link -%}
-
-{% block header_actions %}
-{% include 'templates/includes/projects/project_search_box.html' %}
-{% endblock %}
-
+{% block header %}<h1>{{ doc.project_name }}</h1>{% endblock %}
+{% block header_actions %}{% if doc.percent_complete %}
+ <div class="progress progress-hg">
+ <div class="progress-bar progress-bar-{{ "warning" if doc.percent_complete|round < 100 else "success" }} active" role="progressbar"
+ aria-valuenow="{{ doc.percent_complete|round|int }}"
+ aria-valuemin="0" aria-valuemax="100" style="width:{{ doc.percent_complete|round|int }}%;">
+ </div>
+ </div>
+ {% endif %}{% endblock %}
{% block breadcrumbs %}
<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
@@ -29,24 +33,6 @@
{% block page_content %}
-<div class="row">
-<div class="col-xs-6">
-<h2 class= "title">
- {{ doc.project_name }}
-</h2>
-</div>
-<div class="col-xs-6">
- {% if doc.percent_complete %}
- <div class="progress progress-hg">
- <div class="progress-bar progress-bar-{{ "warning" if doc.percent_complete|round < 100 else "success" }} active" role="progressbar"
- aria-valuenow="{{ doc.percent_complete|round|int }}"
- aria-valuemin="0" aria-valuemax="100" style="width:{{ doc.percent_complete|round|int }}%;">
- </div>
- </div>
- {% endif %}
-</div>
-</div>
-<hr class="small">
<div class="clearfix">
<h4 style="float: left;">{{ _("Tasks") }}</h4>
diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py
index 86f064c..06c43bb 100644
--- a/erpnext/templates/pages/projects.py
+++ b/erpnext/templates/pages/projects.py
@@ -7,7 +7,8 @@
def get_context(context):
context.no_cache = 1
-
+ context.show_search = True
+ context.show_sidebar = True
project = frappe.get_doc('Project', frappe.form_dict.project)
project.has_permission('read')