address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index aef91a9..322ce60 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -9,7 +9,7 @@
</header>
<div id="body_div">
<div class="navbar-wrapper">
- <div class="navbar navbar-inverse"
+ <div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
style="margin-bottom: 0px;">
<div class="navbar-inner">
<div class="container">
@@ -61,7 +61,6 @@
</div>
</div>
<script>$('.dropdown-toggle').dropdown()</script>
-
<div class="content" id="page-{{ name }}" style="display: block;">
{% block content %}
{% endblock %}
diff --git a/website/templates/html/product_group.html b/website/templates/html/product_group.html
index c44f695..7c22a15 100644
--- a/website/templates/html/product_group.html
+++ b/website/templates/html/product_group.html
@@ -9,7 +9,10 @@
<div class="layout-main" style="padding: 30px;">
{% include 'html/product_search_box.html' %}
{% include 'html/product_breadcrumbs.html' %}
- {% if description %}
+ {% if slideshow %}<!-- slideshow -->
+ {% include "html/slideshow.html" %}
+ {% endif %}
+ {% if description %}<!-- description -->
<div>{{ description or ""}}</div>
{% else %}
<h3>{{ name }}</h3>
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index 898a669..a574cf6 100644
--- a/website/templates/html/product_page.html
+++ b/website/templates/html/product_page.html
@@ -22,19 +22,25 @@
<div class="layout-main" style="padding: 30px;">
{% include 'html/product_search_box.html' %}
{% include 'html/product_breadcrumbs.html' %}
- <h3>{{ item_name }}</h3>
+ <h3 itemprop="name">{{ item_name }}</h3>
<p class="help">Item Code: {{ name }}</p>
- <div class="product-page-content">
- <div class="span6">
- {% if website_image %}
- <image class="item-main-image" src="{% if website_image.lower().startswith('http') %}{{ website_image}}{% else %}files/{{ website_image }}{% endif %}" />
+ <div class="product-page-content"
+ itemscope itemtype="http://schema.org/Product">
+ {% if slideshow %}
+ {% include "html/slideshow.html" %}
{% else %}
- <div class="img-area">
- {% include 'html/product_missing_image.html' %}
+ <div class="span6">
+ {% if website_image %}
+ <image itemprop="image" class="item-main-image"
+ src="{{ website_image }}" />
+ {% else %}
+ <div class="img-area">
+ {% include 'html/product_missing_image.html' %}
+ </div>
+ {% endif %}
</div>
{% endif %}
<br><br>
- </div>
<div class="span3">
<div class="item-price hide">
<p>Price:</p>
@@ -44,7 +50,7 @@
<div class="clearfix"></div>
<div class="span9">
<h3>Product Description</h3>
- <div>
+ <div itemprop="description">
{{ web_long_description or web_short_description or
"[No description given]" }}
</div>
diff --git a/website/templates/html/slideshow.html b/website/templates/html/slideshow.html
new file mode 100644
index 0000000..8641724
--- /dev/null
+++ b/website/templates/html/slideshow.html
@@ -0,0 +1,21 @@
+{% if slideshow %}
+{{ slideshow_header }}
+<div id="myCarousel" class="carousel slide">
+ <div class="carousel-inner">
+ {% for slide in obj.slides %}
+ <div class="{% if slide.idx==1 %}active {% endif %}item">
+ <img src="{{ slide.image }}" />
+ <div class="carousel-caption">
+ <h4>{{ slide.heading }}</h4>
+ <p>{{ slide.description }}</p>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ <a class="carousel-control left" href="#myCarousel"
+ data-slide="prev">‹</a>
+ <a class="carousel-control right" href="#myCarousel"
+ data-slide="next">›</a>
+ </div>
+ <script>$(".carousel").carousel();</script>
+{% endif %}
diff --git a/website/templates/html/web_page.html b/website/templates/html/web_page.html
index 78da963..aaa0aa8 100644
--- a/website/templates/html/web_page.html
+++ b/website/templates/html/web_page.html
@@ -10,27 +10,7 @@
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" style="text-align: {{ text_align }};">
<div class="layout-main">
- {% if slideshow %}
- {{ slideshow_header }}
- <div id="myCarousel" class="carousel slide">
- <div class="carousel-inner">
- {% for slide in obj.slides %}
- <div class="{% if slide.idx==1 %}active {% endif %}item">
- <img src="{{ slide.image }}" />
- <div class="carousel-caption">
- <h4>{{ slide.heading }}</h4>
- <p>{{ slide.description }}</p>
- </div>
- </div>
- {% endfor %}
- </div>
- <a class="carousel-control left" href="#myCarousel"
- data-slide="prev">‹</a>
- <a class="carousel-control right" href="#myCarousel"
- data-slide="next">›</a>
- </div>
- <script>$(".carousel").carousel();</script>
- {% endif %}
+ {% include "html/slideshow.html" %}
{{ main_section }}
</div>
</div>