website updates and fix to sessions
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index 9741451..1580cbe 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"
style="margin-bottom: 0px;">
<div class="navbar-inner">
<div class="container">
diff --git a/website/templates/html/product_group.html b/website/templates/html/product_group.html
index d5e1871..91d79b5 100644
--- a/website/templates/html/product_group.html
+++ b/website/templates/html/product_group.html
@@ -1 +1,35 @@
{% extends "html/page.html" %}
+
+{% block content %}
+
+<div class="layout-wrapper layout-wrapper-background">
+ <div class="web-content" id="content-product_group">
+ <div class="layout-main" style="padding: 30px;">
+ {% include 'html/product_search_box.html' %}
+ {% if description %}
+ <div>{{ description or ""}}</div>
+ {% else %}
+ <h3>{{ name }}</h3>
+ {% endif %}
+ {% if sub_groups %}
+ <div class="well">
+ <div class="container-fluid">
+ {% for d in sub_groups %}
+ <div class="span2">
+ <i class="icon-chevron-right"></i>
+ <a href="{{ d.page_name }}">{{ d.name }}</a></div>
+ {% endfor %}
+ </div>
+ </div>
+ {% endif %}
+ {% if obj.doclist.get({"doctype":"Featured Item"}) %}
+ <hr>
+ <h3>Featured Products</h3>
+
+ {% endif %}
+
+ </div>
+ </div>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index 50b3060..dd94190 100644
--- a/website/templates/html/product_page.html
+++ b/website/templates/html/product_page.html
@@ -22,6 +22,7 @@
<div class="layout-main" style="padding: 30px;">
{% include 'html/product_search_box.html' %}
<h1>{{ item_name }}</h1>
+ <p class="help">Item Code: {{ name }}</p>
<div class="product-page-content">
<div class="span6">
{% if website_image %}
@@ -29,7 +30,7 @@
{% else %}
<div class="img-area">
<div style='background-color: #eee; padding: 40px;
- width: 32px; font-size: 32px; color: #888;'>
+ width: 32px; font-size: 32px; color: #888;' title='No Image'>
<i class='icon-camera'></i></div>
</div>
@@ -46,7 +47,8 @@
<div class="span9">
<h3>Product Description</h3>
<div>
- {{ web_long_description or web_short_description }}
+ {{ web_long_description or web_short_description or
+ "[No description given]" }}
</div>
<hr>
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %}
diff --git a/website/templates/html/product_search_box.html b/website/templates/html/product_search_box.html
index 3cbb3e9..125f0ba 100644
--- a/website/templates/html/product_search_box.html
+++ b/website/templates/html/product_search_box.html
@@ -1,7 +1,8 @@
-<div class="pull-right">
+<div class="pull-right" style="margin-top:-15px;">
<form class="form-search">
<div class="input-append">
- <input type="text" class="span2 search-query" id="product-search">
+ <input type="text" class="span2 search-query"
+ id="product-search" placeholder="Product Search...">
<button class="btn" id="btn-product-search">
<i class="icon-search"></i></button>
</div>
@@ -21,4 +22,5 @@
})
})
</script>
-</div>
\ No newline at end of file
+</div>
+<div class="clearfix"></div>
\ No newline at end of file