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

[major] upgrade to bootstrap 3

Browse Source
This commit is contained in:
Rushabh Mehta 2013-08-21 17:48:08 +05:30
parent 8331bbfc92
commit cce21d11fa
41 changed files with 146 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/page/general_ledger/general_ledger.js
View File

@ -141,13 +141,13 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
toggle_group_by_checks: function() {
this.make_account_by_name();
this.filter_inputs.group_by_ledger
.parent().toggle(!!(this.account_by_name[this.account]
&& this.account_by_name[this.account].group_or_ledger==="Group"));
this.filter_inputs.group_by_voucher
.parent().toggle(!!(this.account_by_name[this.account]
&& this.account_by_name[this.account].group_or_ledger==="Ledger"));
// this.filter_inputs.group_by_ledger
// .parent().toggle(!!(this.account_by_name[this.account]
// && this.account_by_name[this.account].group_or_ledger==="Group"));
//
// this.filter_inputs.group_by_voucher
// .parent().toggle(!!(this.account_by_name[this.account]
// && this.account_by_name[this.account].group_or_ledger==="Ledger"));
},
prepare_data: function() {
var me = this;

2
selling/doctype/sales_common/sales_common.js
View File

@ -640,7 +640,7 @@ var set_sales_bom_help = function(doc) {
$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true);
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
help_msg = "<div class='alert'> \
help_msg = "<div class='alert alert-warning'> \
For 'Sales BOM' items, warehouse, serial no and batch no \
will be considered from the 'Packing List' table. \
If warehouse and batch no are same for all packing items for any 'Sales BOM' item, \

12
setup/page/setup/setup.js
View File

@ -41,15 +41,15 @@ wn.pages.Setup.make = function(wrapper) {
})
.appendTo(body);
$('<div class="col col-lg-1"></div>').appendTo(row);
$('<div class="col-md-1"></div>').appendTo(row);
if(item.type==="Link") {
var col = $('<div class="col col-lg-5"><b><a href="#'
var col = $('<div class="col-md-5"><b><a href="#'
+item.route+'"><i class="'+item.icon+'"></i> '
+item.title+'</a></b></div>').appendTo(row);
} else {
var col = $(repl('<div class="col col-lg-5">\
var col = $(repl('<div class="col-md-5">\
<span class="badge view-link">%(count)s</span>\
<b><i class="%(icon)s"></i>\
<a class="data-link">%(title)s</a></b>\
@ -73,9 +73,9 @@ wn.pages.Setup.make = function(wrapper) {
}
if(dependency)
col.addClass("col-offset-1");
col.addClass("col-md-offset-1");
else
$('<div class="col col-lg-1"></div>').appendTo(row);
$('<div class="col-md-1"></div>').appendTo(row);
if(item.doctype) {
var badge = col.find(".badge, .data-link")
@ -94,7 +94,7 @@ wn.pages.Setup.make = function(wrapper) {
}
// tree
$links = $('<div class="col col-lg-5">').appendTo(row);
$links = $('<div class="col-md-5">').appendTo(row);
if(item.tree) {
$('<a class="view-link"><i class="icon-sitemap"></i> Browse</a>\

2
utilities/doctype/rename_tool/rename_tool.js
View File

@ -18,7 +18,7 @@ cur_frm.cscript.select_doctype = function() {
cur_frm.cscript.setup_upload = function() {
var me = this;
var $wrapper = $(cur_frm.fields_dict.upload_html.wrapper).empty()
.html("<hr><div class='alert'>" +
.html("<hr><div class='alert alert-warning'>" +
wn._("Upload a .csv file with two columns: the old name and the new name. Max 500 rows.")
+ "</div>");
var $log = $(cur_frm.fields_dict.rename_log.wrapper).empty();

1
website/css/website.css
View File

@ -167,6 +167,7 @@ fieldset {
.btn-default:focus,
.btn-default:active,
.btn-default.active {
color: #ffffff;
background-color: #9a9c9d;
border-color: #8d9091;
}

2
website/doctype/blog_post/blog_post.py
View File

@ -30,6 +30,7 @@ class DocType:
def prepare_template_args(self):
import webnotes.utils
import markdown2
# this is for double precaution. usually it wont reach this code if not published
if not webnotes.utils.cint(self.doc.published):
@ -65,3 +66,4 @@ class DocType:
self.doc.comment_list = comment_list or []
for comment in self.doc.comment_list:
comment['comment_date'] = webnotes.utils.global_date_format(comment['creation'])
comment['comment'] = markdown2.markdown(comment['comment'])

12
website/doctype/style_settings/custom_template.css
View File

@ -66,6 +66,10 @@ div.web-footer, div.web-footer a {
}
/* Bootstrap Navbar */
.navbar-default {
border: 0px;
}
.navbar {
box-shadow: none;
border-radius: 0px;
@ -166,8 +170,8 @@ div.web-footer, div.web-footer a {
}
.navbar .nav li.dropdown > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_background }};
border-bottom-color: #{{ doc.top_bar_background }};
border-top-color: #{{ doc.top_bar_foreground }};
border-bottom-color: #{{ doc.top_bar_foreground }};
}
.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
@ -178,6 +182,10 @@ div.web-footer, div.web-footer a {
}
.navbar-default .navbar-toggle .icon-bar {
background-color: #{{ doc.top_bar_foreground }};
}
.breadcrumb {
background-color: #{{ get_hex_shade(doc.page_background, 10) }};
}

2
website/doctype/style_settings/style_settings.js
View File

@ -6,7 +6,7 @@ cur_frm.cscript.onload_post_render = function() {
wn.require('lib/public/js/lib/jscolor/jscolor.js');
$.each(["background_color", "page_background", "page_text", "page_links",
"top_bar_background", "top_bar_foreground", "page_headings"], function(i, v) {
cur_frm.fields_dict[v].input.className = 'color';
$(cur_frm.fields_dict[v].input).addClass('color');
})
jscolor.bind();
}

2
website/templates/html/blog_footer.html
View File

@ -1,4 +1,4 @@
<div class="col col-lg-12">
<div class="col-md-12">
<hr />
{% if categories %}
<h5>Explore posts by categories</h5>

12
website/templates/html/blog_page.html
View File

@ -9,7 +9,7 @@
{% endblock %}
{% block content %}
<div class="col col-lg-12" itemscope itemtype="http://schema.org/BlogPost">
<div class="col-md-12" itemscope itemtype="http://schema.org/BlogPost">
<h2 itemprop="name headline">{{ title }}</h2>
<!-- begin blog content -->
@ -38,14 +38,16 @@
{% include 'app/website/templates/html/comment.html' %}
</div>
<div><button class="btn btn-default add-comment">{{ texts.add_comment }}</button></div>
<div style="display: none; margin-top: 10px;"
<div style="display: none; margin-top: 10px; max-width: 400px;"
id="comment-form">
<div class="alert" style="display:none;"></div>
<form>
<fieldset>
<input name="comment_by_fullname" placeholder="Your Name" type="text"/><br>
<input name="comment_by" placeholder="Your Email Id" type="text"/><br>
<textarea name="comment" placeholder="Comment" style="width: 300px; height: 120px;"/>
<input class="form-control" name="comment_by_fullname" placeholder="Your Name" type="text"/><br>
<input class="form-control" name="comment_by"
placeholder="Your Email Id" type="text"/><br>
<textarea class="form-control" name="comment" rows=10
placeholder="Comment"/>
</textarea><br>
<button class="btn btn-info" id="submit-comment">{{ texts.submit }}</button>
</fieldset>

4
website/templates/html/blogger.html
View File

@ -1,10 +1,10 @@
<div class="row">
<div class="col col-lg-2">
<div class="col-md-2">
<div class="avatar avatar-large">
<img itemprop="thumbnailUrl" src="{{ blogger_info.avatar }}" />
</div>
</div>
<div class="col col-lg-10">
<div class="col-md-10">
<h4>{{ blogger_info.full_name }}</h4>
<p style="color: #999">{{ blogger_info.bio }}</p>
<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">

6
website/templates/html/footer.html
View File

@ -1,6 +1,6 @@
<footer class="container">
<div class="web-footer row">
<div class="col col-lg-12">
<div class="col-md-12">
{% if facebook_share or google_plus_one or twitter_share or linked_in_share %}
<div class="social-icons" style="">
<span style="font-size: 11px;">{{ share_text or "Share this page on: "}}</span>
@ -40,8 +40,8 @@
{{ address }}
{% endif %}
<br>
<div class="input-group col col-lg-6 col-offset-3">
<input type="text" id="footer-subscribe-email" placeholder="Your email address...">
<div class="input-group col-md-6 col-md-offset-3">
<input class="form-control" type="text" id="footer-subscribe-email" placeholder="Your email address...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="footer-subscribe-button">Stay Updated</button>
</span>

8
website/templates/html/navbar.html
View File

@ -1,13 +1,15 @@
<div class="navbar">
<a class="navbar-brand" href="index">{{ brand_html or "<i class='icon-home'></i>"}}</a>
<div class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="nav-collapse collapse navbar-responsive-collapse">
<a class="navbar-brand" href="index">{{ brand_html or "<i class='icon-home'></i>"}}</a>
</div>
<div class="collapse navbar-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav">
{%- for page in top_bar_items -%}
{% if not page.parent_label -%}

2
website/templates/html/outer.html
View File

@ -20,7 +20,7 @@
</div>
<div class="clearfix"></div>
{% if banner_html %}<div class="row banner">
<div class="col col-lg-12">{{ banner_html }}</div>
<div class="col-md-12">{{ banner_html }}</div>
</div>{% endif %}
<div class="outer">
{% include "app/website/templates/html/navbar.html" %}

6
website/templates/html/partner_page.html
View File

@ -1,9 +1,9 @@
{% extends "app/website/templates/html/page.html" %}
{% block content %}
<div class="col col-lg-12" itemscope itemtype="http://schema.org/Organization">
<div class="col-md-12" itemscope itemtype="http://schema.org/Organization">
<div class="row">
<div class="col col-lg-4">
<div class="col-md-4">
{% if logo -%}
<img itemprop="brand" src="{{ logo }}" class="partner-logo"
alt="{{ partner_name }}" title="{{ partner_name }}" />
@ -17,7 +17,7 @@
{% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
</address>
</div>
<div class="col col-lg-8">
<div class="col-md-8">
<h3 itemprop="name" style="margin-top: 0px;">{{ partner_name }}</h3>
<p>{{ description }}</p>
</div>

2
website/templates/html/product_breadcrumbs.html
View File

@ -1,5 +1,5 @@
{% if obj.parent_groups and len(obj.parent_groups) > 1 %}
<div class="col col-lg-12">
<div class="col-md-12">
<div class="clearfix">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}

6
website/templates/html/product_group.html
View File

@ -3,7 +3,7 @@
{% block content %}
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
<div class="col col-lg-12">
<div class="col-md-12">
{% if slideshow %}<!-- slideshow -->
{% include "app/website/templates/html/slideshow.html" %}
{% endif %}
@ -13,12 +13,12 @@
<h3>{{ name }}</h3>
{% endif %}
</div>
<div class="col col-lg-12">
<div class="col-md-12">
{% if sub_groups %}
<hr />
<div class="row">
{% for d in sub_groups %}
<div class="col col-lg-4">
<div class="col-md-4">
<a href="{{ d.page_name }}">{{ d.name }} ({{ d.count }})</a>
</div>
{% endfor %}

2
website/templates/html/product_in_grid.html
View File

@ -1,4 +1,4 @@
<div class="col col-lg-3">
<div class="col-md-3">
<div style="height: 120px; overflow: hidden;">
<a href="{{ page_name }}">
{%- if website_image -%}

2
website/templates/html/product_in_list.html
View File

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

12
website/templates/html/product_page.html
View File

@ -11,9 +11,9 @@
{% block content %}
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
<div class="col col-lg-12 product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="col-md-12 product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col col-lg-6">
<div class="col-md-6">
{% if slideshow %}
{% include "app/website/templates/html/slideshow.html" %}
{% else %}
@ -27,7 +27,7 @@
{% endif %}
{% endif %}
</div>
<div class="col col-lg-6">
<div class="col-md-6">
<h3 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h3>
<p class="help">Item Code: <span itemprop="productID">{{ name }}</span></p>
<h4>Product Description</h4>
@ -42,9 +42,9 @@
<button class="btn btn-primary">
<i class="icon-shopping-cart"></i> Add to Cart</button>
</div>
<div id="item-update-cart" class="input-group col-lg-4" style="display: none;
<div id="item-update-cart" class="input-group col-md-4" style="display: none;
padding-left: 0px; padding-right: 0px;">
<input type="text">
<input class="form-control" type="text">
<div class="input-group-btn">
<button class="btn btn-primary">
<i class="icon-ok"></i></button>
@ -56,7 +56,7 @@
</div>
{% if obj.doclist.get({"doctype":"Item Website Specification"}) -%}
<div class="row" style="margin-top: 20px">
<div class="col col-lg-12">
<div class="col-md-12">
<h4>Specifications</h4>
<table class="table table-bordered" style="width: 100%">
{% for d in obj.doclist.get(

6
website/templates/html/product_search_box.html
View File

@ -1,8 +1,8 @@
<div class="col col-lg-12 clearfix">
<div class="col-md-12 clearfix">
<div class="pull-right" style="margin-top: 15px; margin-bottom: 15px;">
<form class="form-search">
<div class="input-group col col-lg-4 col-offset-8">
<input type="text" id="product-search" placeholder="Product 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>

2
website/templates/html/web_page.html
View File

@ -7,7 +7,7 @@
{% endblock %}
{% block content %}
<div class="col col-lg-12" style="margin-top: 15px;">
<div class="col-md-12" style="margin-top: 15px;">
{% include "app/website/templates/html/slideshow.html" %}
{{ main_section }}
</div>

6
website/templates/js/blog.js
View File

@ -56,12 +56,12 @@ var blog = {
b.page_name = encodeURIComponent(b.page_name);
$(repl('<div class="row">\
<div class="col col-lg-1">\
<div class="col-md-1">\
<div class="avatar avatar-medium" style="margin-top: 6px;">\
<img src="%(avatar)s" />\
</div>\
</div>\
<div class="col col-lg-11">\
<div class="col-md-11">\
<h4><a href="%(page_name)s">%(title)s</a></h4>\
<p>%(content)s</p>\
<p style="color: #aaa; font-size: 90%">\
@ -77,7 +77,7 @@ var blog = {
.parent().append("<div class='text-muted'>Nothing more to show.</div>");
} else {
$("#next-page").toggle(false)
.parent().append("<div class='alert'>No blogs written yet.</div>");
.parent().append("<div class='alert alert-warning'>No blogs written yet.</div>");
}
} else {
$("#next-page").toggle(true);

4
website/templates/js/blog_page.js
View File

@ -11,7 +11,7 @@ $(document).ready(function() {
}
if(n_comments > 50) {
$(".add-comment").toggle(false)
.parent().append("<div class='alert'>Comments are closed.</div>")
.parent().append("<div class='alert alert-warning'>Comments are closed.</div>")
}
$(".add-comment").click(function() {
$("#comment-form").toggle();
@ -54,7 +54,7 @@ $(document).ready(function() {
$(".no_comment").toggle(false);
$(".add-comment").toggle(false);
$("#comment-form")
.replaceWith("<div class='alert'>Thank you for your comment!</div>")
.replaceWith("<div class='alert alert-success'>Thank you for your comment!</div>")
}
}
})

18
website/templates/js/cart.js
View File

@ -133,16 +133,16 @@ $.extend(wn.cart, {
if(doc.description === doc.item_name) doc.description = "";
$(repl('<div class="row">\
<div class="col col-lg-9 col-sm-9">\
<div class="col-md-9 col-sm-9">\
<div class="row">\
<div class="col col-lg-3">%(image_html)s</div>\
<div class="col col-lg-9">\
<div class="col-md-3">%(image_html)s</div>\
<div class="col-md-9">\
<h4><a href="%(page_name)s">%(item_name)s</a></h4>\
<p>%(description)s</p>\
</div>\
</div>\
</div>\
<div class="col col-lg-3 col-sm-3 text-right">\
<div class="col-md-3 col-sm-3 text-right">\
<div class="input-group item-update-cart">\
<input type="text" placeholder="Qty" value="%(qty)s" \
data-item-code="%(item_code)s" class="text-right">\
@ -166,14 +166,14 @@ $.extend(wn.cart, {
}
var $tax_row = $(repl('<div class="row">\
<div class="col col-lg-9 col-sm-9">\
<div class="col-md-9 col-sm-9">\
<div class="row">\
<div class="col col-lg-9 col-offset-3">' +
<div class="col-md-9 col-md-offset-3">' +
(shipping_selector || '<p>%(description)s</p>') +
'</div>\
</div>\
</div>\
<div class="col col-lg-3 col-sm-3 text-right">\
<div class="col-md-3 col-sm-3 text-right">\
<p' + (shipping_selector ? ' style="margin-top: 5px;"' : "") + '>%(formatted_tax_amount)s</p>\
</div>\
</div>', doc)).appendTo($cart_taxes);
@ -209,9 +209,9 @@ $.extend(wn.cart, {
$(repl('<div class="accordion-group"> \
<div class="accordion-heading"> \
<div class="row"> \
<div class="col col-lg-10 address-title" \
<div class="col-md-10 address-title" \
data-address-name="%(name)s"><strong>%(name)s</strong></div> \
<div class="col col-lg-2"><input type="checkbox" \
<div class="col-md-2"><input type="checkbox" \
data-address-name="%(name)s"></div> \
</div> \
</div> \

2
website/templates/js/product_list.js
View File

@ -40,7 +40,7 @@ window.render_product_list = function(data) {
if(data.length < 10) {
if(!table) {
$(".more-btn")
.replaceWith("<div class='alert'>No products found.</div>");
.replaceWith("<div class='alert alert-warning'>No products found.</div>");
} else {
$(".more-btn")
.replaceWith("<div class='text-muted'>Nothing more to show.</div>");

10
website/templates/pages/about.html
View File

@ -3,14 +3,14 @@
{% set title="About Us" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
{{ obj.doc.company_introduction or "<h2>About Us</h2><p>Some Introduction about your company that you would like your website visitor to know. More people than you think will read your About page. People always like to know who the are doing business with. Be authentic and avoid using jargon like 'value added services' etc. Be sure to update your company history and list of key team members in Website > About Us Settings</p>" }}
{% if obj.doclist.get({"doctype":"Company History"}) %}
<h3>{{ obj.doc.company_history_heading or "Company History" }}</h3>
{% for d in obj.doclist.get({"doctype":"Company History"}) %}
<div class="row">
<span class="col col-lg-2"><h4 style="margin:0px;">{{ d.year }}</h4></span>
<span class="col col-lg-10"><p>{{ d.highlight }}</p></span>
<span class="col-md-2"><h4 style="margin:0px;">{{ d.year }}</h4></span>
<span class="col-md-10"><p>{{ d.highlight }}</p></span>
</div>
{% endfor %}
{% endif %}
@ -18,12 +18,12 @@
<h3>{{ obj.doc.team_members_heading or "Team Members" }}</h3>
{% for d in obj.doclist.get({"doctype":"About Us Team Member"}) %}
<div class="row" itemscope itemtype="http://schema.org/Person">
<span class="col col-lg-2">
<span class="col-md-2">
<div class="avatar avatar-large">
<img class="avatar" src="{{ d.image_link }}" style="" itemprop="image">
</div>
</span>
<span class="col col-lg-10"><h4 itemprop="name">{{ d.full_name }}</h4>
<span class="col-md-10"><h4 itemprop="name">{{ d.full_name }}</h4>
<p itemprop="description">{{ d.bio }}</p>
</span>
</div>

2
website/templates/pages/account.html
View File

@ -3,7 +3,7 @@
{% set title="My Account" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li class="active">My Account</li>

8
website/templates/pages/address.html
View File

@ -8,7 +8,7 @@
{% if df.fieldtype in ["Data", "Link"] -%}
<fieldset>
<label>{{ df.label }}</label>
<input type="text" placeholder="Type {{ df.label }}"
<input class="form-control" type="text" placeholder="Type {{ df.label }}"
data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
{% if doc and doc.fields.get(df.fieldname) -%} value="{{ doc.fields[df.fieldname] }}" {%- endif %}>
</fieldset>
@ -37,7 +37,7 @@
{%- endmacro %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>
@ -52,10 +52,10 @@
<div id="address-error" class="alert alert-danger" style="display: none;"></div>
<form autocomplete="on">
<div class="row">
<section class="col col-lg-6">
<section class="col-md-6">
{{ render_fields(meta.left_fields) }}
</section>
<section class="col col-lg-6">
<section class="col-md-6">
{{ render_fields(meta.right_fields) }}
</section>
</section>

2
website/templates/pages/addresses.html
View File

@ -3,7 +3,7 @@
{% set title="My Addresses" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>

2
website/templates/pages/blog.html
View File

@ -11,7 +11,7 @@
{% set title="Blog" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<h2 id="blog-title">{{ blog_title }}</h2>
{% if blog_introduction %}
<p>{{ blog_introduction }}</p>

12
website/templates/pages/cart.html
View File

@ -7,7 +7,7 @@
{% set title="Shopping Cart" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<h2><i class="icon-shopping-cart"></i> {{ title }}</h2>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-info" style="width: 100%;"></div>
@ -18,12 +18,12 @@
<div id="cart-error" class="alert alert-danger" style="display: none;"></div>
<hr>
<div class="row">
<div class="col col-lg-9 col-sm-9">
<div class="col-md-9 col-sm-9">
<div class="row">
<div class="col col-lg-9 col-offset-3"><h4>Item Details</h4></div>
<div class="col-md-9 col-md-offset-3"><h4>Item Details</h4></div>
</div>
</div>
<div class="col col-lg-3 col-sm-3 text-right"><h4>Qty, Amount</h4></div>
<div class="col-md-3 col-sm-3 text-right"><h4>Qty, Amount</h4></div>
</div><hr>
<div id="cart-items">
</div>
@ -34,14 +34,14 @@
<hr>
<div id="cart-addresses">
<div class="row">
<div class="col col-lg-6">
<div class="col-md-6">
<h4>Shipping Address</h4>
<div id="cart-shipping-address" class="accordion"
data-fieldname="shipping_address_name"></div>
<button class="btn btn-default" type="button" id="cart-add-shipping-address">
<span class="icon icon-plus"></span> New Shipping Address</button>
</div>
<div class="col col-lg-6">
<div class="col-md-6">
<h4>Billing Address</h4>
<div id="cart-billing-address" class="accordion"
data-fieldname="customer_address"></div>

14
website/templates/pages/contact.html
View File

@ -7,32 +7,32 @@
{% set title="Contact Us" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<h3>{{ obj.doc.heading or "Contact Us"}}</h3>
<div class="row">
<div class="web-form col col-lg-8">
<p id="contact-alert" class="alert"
<div class="web-form col-md-8">
<p id="contact-alert" class="alert alert-warning"
style="display: none;">&nbsp;</p>
<p>
<select name="subject">
<select name="subject" class="form-control">
{% for option in obj.query_options %}
<option value="{{ option }}">{{ option }}</option>
{% endfor %}
</select>
</p>
<p>
<input name="email" type="text"
<input class="form-control" name="email" type="text"
placeholder="Your Email Address" />
</p>
<p>
<textarea rows="10" name="message"></textarea>
<textarea rows="10" name="message" class="form-control"></textarea>
</p>
<p>
<button class="btn btn-primary btn-send">Send</button>
</p>
</div>
{% if obj.doc.address %}
<div class="col col-lg-3 col-offset-1 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
<div class="col-md-3 col-md-offset-1 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
<h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4>
{% if obj.address.address_line1 %}
<span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br>

12
website/templates/pages/order.html
View File

@ -3,7 +3,7 @@
{% set title=doc.name %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>
@ -15,16 +15,16 @@
{%- if doc.status -%}
<div style="font-size: 13px;">
<div class="row">
<div class="col col-lg-2">
<div class="col-md-2">
<div class="label">{{ doc.status }}</div>
</div>
<div class="col col-lg-4">
<div class="col-md-4">
{{ utils.formatdate(doc.transaction_date) }}
</div>
</div>
<br>
<div class="row">
<div class="col col-lg-12">
<div class="col-md-12">
<table class="table table-bordered">
<tbody>
<tr>
@ -52,8 +52,8 @@
</div>
</div>
<div class="row">
<div class="col col-lg-6"></div>
<div class="col col-lg-6">
<div class="col-md-6"></div>
<div class="col-md-6">
<table cellspacing=0 width=100%>
<tbody>
<tr>

16
website/templates/pages/orders.html
View File

@ -8,7 +8,7 @@ global_number_format = "{{ global_number_format }}";
currency = "{{ currency }}";
wn.currency_symbols = {{ currency_symbols }};
</script>
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@ -44,8 +44,8 @@ $(document).ready(function() {
// parent
var $order = $(repl('<div class="row">\
<div class="col col-lg-3"><a href="order?name=%(name)s">%(name)s</a></div>\
<div class="col col-lg-9"></div>\
<div class="col-md-3"><a href="order?name=%(name)s">%(name)s</a></div>\
<div class="col-md-9"></div>\
</div>', order)).appendTo($list);
// items
@ -53,12 +53,12 @@ $(document).ready(function() {
item.export_rate = format_currency(item.export_rate, order.currency);
item.export_amount = format_currency(item.export_amount, order.currency);
var $item = $(repl('<div class="row">\
<div class="col col-lg-3">%(item_name)s</div>\
<div class="col col-lg-2" style="text-align: right;">%(export_rate)s</div>\
<div class="col col-lg-2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
<div class="col col-lg-2" style="text-align: right;">%(export_amount)s</div>\
<div class="col-md-3">%(item_name)s</div>\
<div class="col-md-2" style="text-align: right;">%(export_rate)s</div>\
<div class="col-md-2" style="text-align: right;">%(qty)s %(stock_uom)s</div>\
<div class="col-md-2" style="text-align: right;">%(export_amount)s</div>\
</div>\
</div>', item)).appendTo($order.find(".col col-lg-9"));
</div>', item)).appendTo($order.find(".col-md-9"));
});
$("<hr>").appendTo($list);

6
website/templates/pages/partners.html
View File

@ -3,12 +3,12 @@
{% set title="Partners" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<h2 id="blog-title">{{ title }}</h2>
<hr>
{% for partner_info in partners %}
<div class="row">
<div class="col col-lg-3">
<div class="col-md-3">
{% if partner_info.logo -%}
<a href="{{ partner_info.page_name }}">
<img itemprop="brand" src="{{ partner_info.logo }}" class="partner-logo"
@ -16,7 +16,7 @@
</a>
{%- endif %}
</div>
<div class="col col-lg-9">
<div class="col-md-9">
<a href="{{ partner_info.page_name }}">
<h4>{{ partner_info.partner_name }}</h4>
</a>

2
website/templates/pages/product_search.html
View File

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

12
website/templates/pages/profile.html
View File

@ -3,7 +3,7 @@
{% set title="My Profile" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@ -15,23 +15,23 @@
<form>
<fieldset>
<label>Full Name</label>
<input type="text" id="fullname" placeholder="Your Name">
<input class="form-control" type="text" id="fullname" placeholder="Your Name">
</fieldset>
<fieldset>
<label>Password</label>
<input type="password" id="password" placeholder="Password">
<input class="form-control" type="password" id="password" placeholder="Password">
</fieldset>
<fieldset>
<label>Company Name</label>
<input type="text" id="company_name" placeholder="Company Name" value="{{ company_name }}">
<input class="form-control" type="text" id="company_name" placeholder="Company Name" value="{{ company_name }}">
</fieldset>
<fieldset>
<label>Mobile No</label>
<input type="text" id="mobile_no" placeholder="Mobile No" value="{{ mobile_no }}">
<input class="form-control" type="text" id="mobile_no" placeholder="Mobile No" value="{{ mobile_no }}">
</fieldset>
<fieldset>
<label>Phone</label>
<input type="text" id="phone" placeholder="Phone" value="{{ phone }}">
<input class="form-control" type="text" id="phone" placeholder="Phone" value="{{ phone }}">
</fieldset>
<button id="update_profile" type="submit" class="btn btn-default">Update</button>
</form>

8
website/templates/pages/ticket.html
View File

@ -3,7 +3,7 @@
{% set title=doc.name %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a> <span class="divider">/</span></li>
<li><a href="account">My Account</a> <span class="divider">/</span></li>
@ -14,13 +14,13 @@
<hr>
{%- if doc.status -%}
<div class="row">
<div class="col col-lg-2">
<div class="col-md-2">
<div class="label">{{ doc.status }}</div>
</div>
<div class="col col-lg-7">
<div class="col-md-7">
{{ doc.subject }}
</div>
<div class="col col-lg-3">
<div class="col-md-3">
{{ utils.formatdate(doc.transaction_date) }}
</div>
</div>

8
website/templates/pages/tickets.html
View File

@ -3,7 +3,7 @@
{% set title="My Tickets" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>
@ -39,9 +39,9 @@ $(document).ready(function() {
// parent
var $ticket = $(repl('<div class="row">\
<div class="col col-lg-2"><span class="label">%(status)s</span></div>\
<div class="col col-lg-3"><a href="ticket?name=%(name)s">%(name)s</a></div>\
<div class="col col-lg-7">%(subject)s</div>\
<div class="col-md-2"><span class="label">%(status)s</span></div>\
<div class="col-md-3"><a href="ticket?name=%(name)s">%(name)s</a></div>\
<div class="col-md-7">%(subject)s</div>\
</div>', ticket)).appendTo($list);
$("<hr>").appendTo($list);

2
website/templates/pages/writers.html
View File

@ -3,7 +3,7 @@
{% set title="Blog Writers" %}
{% block content %}
<div class="col col-lg-12">
<div class="col-md-12">
<h2 id="blog-title">Blog Writers</h2>
{% if writers_introduction %}
<p>{{ writers_introduction }}</p>