nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 02:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2013-11-22 18:10:46 +05:30
parent 55afd2620e ef114773a6
commit 4ccb2edbfd
21 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stock/doctype/item/templates/generators/item.html
View File

@@ -24,7 +24,7 @@
{% block content %}
{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
<div class="col-md-12 product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="container content product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col-md-6">
{% if slideshow %}

16
stock/doctype/item/templates/includes/product_breadcrumbs.html
View File

@@ -1,12 +1,10 @@
{% if obj.parent_groups and (obj.parent_groups|length) > 1 %}
<div class="col-md-12">
<div class="clearfix">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a></li>
{% endfor %}
<li class="active">{{ obj.parent_groups[-1].name }}</li>
</ul>
</div>
<div class="container">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a></li>
{% endfor %}
<li class="active">{{ obj.parent_groups[-1].name }}</li>
</ul>
</div>
{% endif %}

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

@@ -1,5 +1,5 @@
<!-- TODO product listing -->
<div class="col-md-12">
<div class="container content">
<div style="height: 120px; overflow: hidden;">
<a href="{{ page_name }}">
{%- if website_image -%}

22
stock/doctype/item/templates/includes/product_search_box.html
View File

@@ -1,15 +1,13 @@
<div class="row clearfix">
<div class="pull-right" style="margin-top: 15px; margin-bottom: 15px;">
<form class="form-search">
<div class="input-group col-md-4 col-md-offset-8">
<input class="form-control" type="text" id="product-search" placeholder="Product Search...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="btn-product-search">
<i class="icon-search"></i></button>
</span>
</div>
</form>
</div>
<div class="container" style="margin-bottom: 7px;">
<form class="form-inline form-search row">
<div class="input-group col-md-4 col-md-offset-8">
<input class="form-control" type="text" id="product-search" placeholder="Product Search...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="btn-product-search">
<i class="icon-search"></i></button>
</span>
</div>
</form>
<script>
// redirect to product search page
$(document).ready(function() {

2
stock/doctype/item/templates/pages/product_search.html
View File

@@ -18,7 +18,7 @@ $(document).ready(function() {
</script>
{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %}
<div class="col-md-12">
<div class="container content">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">