Merge branch 'edge' of github.com:webnotes/erpnext
This commit is contained in:
Anand Doshi
commit
f713d0b2b0
6
patches/february_2013/p07_clear_web_cache.py
Normal file
6
patches/february_2013/p07_clear_web_cache.py
Normal file
@ -0,0 +1,6 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
from website.utils import clear_cache
|
||||
clear_cache()
|
||||
|
||||
@ -186,4 +186,5 @@ patch_list = [
|
||||
"execute:webnotes.delete_doc('DocType', 'Service Order Detail')",
|
||||
"execute:webnotes.delete_doc('DocType', 'Service Quotation Detail')",
|
||||
"patches.february_2013.p06_material_request_mappers",
|
||||
"patches.february_2013.p07_clear_web_cache"
|
||||
]
|
||||
@ -1,20 +1,23 @@
|
||||
.content, div#body_div {
|
||||
width: 780px;
|
||||
div.outer {
|
||||
-moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.9);
|
||||
-webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.9);
|
||||
box-shadow: 0px 0px 3px rgba(0,0,0,0.9);
|
||||
background-color: #fff;
|
||||
border-radius: 5px;
|
||||
padding: 20px;
|
||||
margin: 30px -20px 10px -20px;
|
||||
min-height: 400px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
div#body_div {
|
||||
padding: 0px;
|
||||
min-height: 400px;
|
||||
margin: 40px auto 10px auto;
|
||||
box-shadow: 1px 1px 3px 3px #bbb;
|
||||
border-radius: 5px;
|
||||
overflow: hidden;
|
||||
.outer .navbar {
|
||||
margin: -20px -20px 10px -20px;
|
||||
}
|
||||
|
||||
footer {
|
||||
text-align: left;
|
||||
width: 720px;
|
||||
margin: auto;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.navbar-inner {
|
||||
@ -39,6 +42,14 @@ p, li {
|
||||
padding: 30px;
|
||||
}
|
||||
|
||||
.missing-image {
|
||||
background-color: #eee;
|
||||
padding: 40px;
|
||||
width: 32px;
|
||||
font-size: 32px;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.social-icons {
|
||||
font-size: 120%;
|
||||
float: right;
|
||||
@ -67,11 +78,6 @@ p, li {
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.two-column {
|
||||
width: 50%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.clear {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
@ -4,6 +4,8 @@ body {
|
||||
{% elif doc.background_color %}
|
||||
background-color: #{{ doc.background_color }};
|
||||
background-image: none;
|
||||
{% else %}
|
||||
background-color: #edede7;
|
||||
{% endif %}
|
||||
{% if doc.font %}
|
||||
font-family: '{{ doc.font }}', Verdana, Sans !important;
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
<style>
|
||||
.product-page-content {
|
||||
margin-left: -20px;
|
||||
}
|
||||
.item-main-image {
|
||||
max-width: 100%;
|
||||
max-width: 400px;
|
||||
margin: auto;
|
||||
}
|
||||
.web-long-description {
|
||||
font-size: 18px;
|
||||
|
||||
@ -9,11 +9,7 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" id="blog-{{ name }}">
|
||||
|
||||
<div class="layout-main">
|
||||
|
||||
<div class="span12">
|
||||
<h2>{{ title }}</h2>
|
||||
|
||||
<!-- begin blog content -->
|
||||
@ -54,6 +50,4 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -7,13 +7,19 @@
|
||||
{% block body %}
|
||||
<header>
|
||||
</header>
|
||||
<div id="body_div">
|
||||
<div class="navbar-wrapper">
|
||||
<div class="container">
|
||||
<div class="outer">
|
||||
<div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
|
||||
style="margin-bottom: 0px;">
|
||||
<div class="navbar-inner">
|
||||
<a class="brand" href="index">{{ brand_html }}</a>
|
||||
<div class="container">
|
||||
<a class="brand" href="/">{{ brand_html }}</a>
|
||||
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
{% for page in top_bar_items %}
|
||||
{% if not page.parent_label %}
|
||||
@ -52,7 +58,6 @@
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<img src="lib/images/ui/spinner.gif" id="spinner"/>
|
||||
<ul class="nav pull-right">
|
||||
<li id="login-topbar-item"><a href="login">Login</a></li>
|
||||
</ul>
|
||||
@ -61,12 +66,13 @@
|
||||
</div>
|
||||
</div>
|
||||
<script>$('.dropdown-toggle').dropdown()</script>
|
||||
<div class="content" id="page-{{ name }}" style="display: block;">
|
||||
<div class="content row" id="page-{{ name }}" style="display: block;">
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<footer><div class="web-footer">
|
||||
</div>
|
||||
<footer class="container"><div class="web-footer">
|
||||
{% 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>
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{% if obj.parent_groups and len(obj.parent_groups) > 1 %}
|
||||
<div class="span12">
|
||||
<div class="clearfix">
|
||||
<ul class="breadcrumb">
|
||||
{% for ig in obj.parent_groups[:-1] %}
|
||||
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a> <span class="divider">/</span></li>
|
||||
{% endfor %}
|
||||
<li class="active">{{ obj.parent_groups[-1].name }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
@ -1,12 +1,9 @@
|
||||
{% 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' %}
|
||||
{% include 'html/product_breadcrumbs.html' %}
|
||||
<div class="span12">
|
||||
{% if slideshow %}<!-- slideshow -->
|
||||
{% include "html/slideshow.html" %}
|
||||
{% endif %}
|
||||
@ -16,29 +13,28 @@
|
||||
<h3>{{ name }}</h3>
|
||||
{% endif %}
|
||||
{% if sub_groups %}
|
||||
<div class="well well-small">
|
||||
<div class="container-fluid" style="padding-left: 0px; margin-left:-10px; line-height: 2em;">
|
||||
<hr />
|
||||
<div class="row">
|
||||
{% for d in sub_groups %}
|
||||
<div class="span4">
|
||||
<a href="{{ d.page_name }}">{{ d.name }} ({{ d.count }})</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<hr />
|
||||
{% endif %}
|
||||
{% if items %}
|
||||
<div id="search-list">
|
||||
<table class="table">
|
||||
<div id="search-list" class="row">
|
||||
{% for item in items %}
|
||||
{{ item }}
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
{% if len(items)==20 %}
|
||||
<div class="alert info">Showing top 20</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="alert">No items listed.</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@ -1,14 +1,11 @@
|
||||
<tr>
|
||||
<td style="width: 30%;">
|
||||
<div class="span3">
|
||||
<div style="height: 120px; overflow: hidden;">
|
||||
{% if website_image %}
|
||||
<img class="product-image" style="width: 80%;" src="{{ website_image }}">
|
||||
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
|
||||
{% else %}
|
||||
{% include 'html/product_missing_image.html' %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
</div>
|
||||
<h4><a href="{{ page_name }}">{{ item_name }}</a></h4>
|
||||
<p class="help">Item Code: {{ name }}</p>
|
||||
<p>{{ website_description }}</p>
|
||||
</td>
|
||||
</tr>
|
||||
</div>
|
||||
@ -9,19 +9,16 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" id="content-product-{{ name }}">
|
||||
<div class="layout-main" style="padding: 30px;">
|
||||
{% include 'html/product_search_box.html' %}
|
||||
{% include 'html/product_breadcrumbs.html' %}
|
||||
<div class="span12">
|
||||
<h3 itemprop="name">{{ item_name }}</h3>
|
||||
<p class="help">Item Code: {{ name }}</p>
|
||||
<div class="product-page-content"
|
||||
itemscope itemtype="http://schema.org/Product">
|
||||
</div>
|
||||
<div class="span12 product-page-content" itemscope itemtype="http://schema.org/Product">
|
||||
{% if slideshow %}
|
||||
{% include "html/slideshow.html" %}
|
||||
{% else %}
|
||||
<div class="span6">
|
||||
{% if website_image %}
|
||||
<image itemprop="image" class="item-main-image"
|
||||
src="{{ website_image }}" />
|
||||
@ -30,16 +27,9 @@
|
||||
{% include 'html/product_missing_image.html' %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<br><br>
|
||||
<div class="span3">
|
||||
<div class="item-price hide">
|
||||
<p>Price:</p>
|
||||
</div>
|
||||
<div class="item-stock"></div>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="row">
|
||||
<div class="span9">
|
||||
<h3>Product Description</h3>
|
||||
<div itemprop="description">
|
||||
@ -60,8 +50,11 @@
|
||||
</table>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="span3">
|
||||
<div class="item-price hide">
|
||||
<p>Price:</p>
|
||||
</div>
|
||||
<div class="item-stock"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
<div class="pull-right" style="margin-top:-15px;">
|
||||
<div class="span12 clearfix">
|
||||
<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" placeholder="Product Search...">
|
||||
id="product-search" placeholder="Product Search..." />
|
||||
<button class="btn" id="btn-product-search">
|
||||
<i class="icon-search"></i></button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script>
|
||||
// redirect to product search page
|
||||
$(document).ready(function() {
|
||||
@ -24,4 +26,3 @@
|
||||
})
|
||||
</script>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
@ -7,12 +7,8 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" style="text-align: {{ text_align }};">
|
||||
<div class="layout-main">
|
||||
<div class="span12" style="margin-top: 15px;">
|
||||
{% include "html/slideshow.html" %}
|
||||
{{ main_section }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -3,8 +3,7 @@
|
||||
{% set title="About Us" %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper">
|
||||
<div class="layout-main">
|
||||
<div class="span12">
|
||||
{{ 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>
|
||||
@ -36,5 +35,4 @@
|
||||
{% endif %}
|
||||
{{ obj.doc.footer or "" }}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -11,10 +11,7 @@
|
||||
{% set title="Blog" %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" id="content-blog">
|
||||
|
||||
<div class="layout-main">
|
||||
<div class="span12">
|
||||
<h1>Blog</h1>
|
||||
<br>
|
||||
<div id="blog-list">
|
||||
@ -25,6 +22,4 @@
|
||||
style="display:none;">More...</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -7,9 +7,9 @@
|
||||
{% set title="Contact Us" %}
|
||||
|
||||
{% block content %}
|
||||
<div class="layout-wrapper">
|
||||
<div class="layout-main row">
|
||||
<div class="web-form span5 pull-left">
|
||||
<div class="span12">
|
||||
<div class="row">
|
||||
<div class="web-form span8">
|
||||
{{ obj.doc.introduction or "<h3>Contact Us</h3>"}}
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
@ -28,7 +28,7 @@
|
||||
<p><button class="btn btn-primary btn-send">Send</button></p>
|
||||
</div>
|
||||
{% if obj.doc.address %}
|
||||
<div class="pull-right span3 alert" itemscope itemtype="http://schema.org/PostalAddress">
|
||||
<div class="span3 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>
|
||||
@ -50,7 +50,6 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -17,12 +17,10 @@ $(document).ready(function() {
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="layout-wrapper layout-wrapper-background">
|
||||
<div class="web-content" id="content-product_search">
|
||||
<div class="layout-main" style="padding: 30px;">
|
||||
{% include 'html/product_search_box.html' %}
|
||||
<div class="span12">
|
||||
<h3 class="search-results">Search Results</h3>
|
||||
<div id="search-list">
|
||||
<div id="search-list" class="row">
|
||||
|
||||
</div>
|
||||
<div style="text-align: center;">
|
||||
@ -32,7 +30,4 @@ $(document).ready(function() {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
Loading…
x
Reference in New Issue
Block a user