[WIP] No not merge
This commit is contained in:
parent
867dfec64b
commit
2dbf5294a9
@ -19,6 +19,7 @@ docs_version = "6.x.x"
|
|||||||
splash_light_background = True
|
splash_light_background = True
|
||||||
|
|
||||||
def get_context(context):
|
def get_context(context):
|
||||||
|
context.brand_html = "ERPNext"
|
||||||
context.app.splash_light_background = True
|
context.app.splash_light_background = True
|
||||||
context.top_bar_items = [
|
context.top_bar_items = [
|
||||||
{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
|
{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
|
||||||
|
@ -44,12 +44,11 @@ $.extend(shopping_cart, {
|
|||||||
var cart_count = getCookie("cart_count");
|
var cart_count = getCookie("cart_count");
|
||||||
|
|
||||||
if($(".cart-icon").length == 0) {
|
if($(".cart-icon").length == 0) {
|
||||||
$('<div class="cart-icon" style="float:right;padding-top:10px;">\
|
$('<div class="cart-icon" style="float:right;padding-top:5px;padding-right:10px;padding-left:10px;border-radius:10px;\
|
||||||
<a href="/cart" class="text-muted small">\
|
border: 2px solid #2fa5d6;color:#2fa5d6;">\
|
||||||
<div class="btn btn-primary cart"> Cart\
|
<a href="/cart" style="color:#2fa5d6;">\
|
||||||
<span id="cart-count" class="label" style="padding-left:5px;margin-left:5px;\
|
<i class="icon-shopping-cart"></i> <span style="\
|
||||||
margin-right:-5px;background-color: #2905E2;">\
|
position: relative; bottom: 2ex; font-size: 75%; margin-left:-12px;" id="cart-count"></span> Cart\
|
||||||
</span>\
|
|
||||||
</div>\
|
</div>\
|
||||||
</a></div>').appendTo($('.hidden-xs'))
|
</a></div>').appendTo($('.hidden-xs'))
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,11 @@
|
|||||||
{% if not hide_footer_signup %}
|
{% if not hide_footer_signup %}
|
||||||
<div class="container">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-6 col-sm-offset-3 text-center" style="margin-top: 15px;">
|
|
||||||
<input class="form-control" type="text" id="footer-subscribe-email"
|
<input class="form-control" type="text" id="footer-subscribe-email"
|
||||||
style="display: inline-block; max-width: 50%; margin-right: 10px;"
|
style="display: inline-block; max-width: 50%;margin-right:15px;"
|
||||||
placeholder="{{ _('Your email address') }}...">
|
placeholder="{{ _('Your email address') }}...">
|
||||||
<button class="btn btn-default btn-sm" type="button"
|
<button class="btn btn-default btn-sm btn-subscribe" type="button"
|
||||||
id="footer-subscribe-button">{{ _("Get Updates") }}</button>
|
id="footer-subscribe-button" style="float:right; border-radius:8px; border:1px solid #78D6FF; color:#78D6FF; background-color:white;">{{ _("Get Updates") }}</button>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="text-center text-muted small" style="padding: 30px;">
|
|
||||||
<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-extra-muted">
|
|
||||||
Powered by ERPNext</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script>
|
<script>
|
||||||
frappe.ready(function() {
|
frappe.ready(function() {
|
||||||
$("#footer-subscribe-button").click(function() {
|
$("#footer-subscribe-button").click(function() {
|
||||||
|
@ -1 +1,2 @@
|
|||||||
<!-- blank -->
|
<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-muted">
|
||||||
|
Powered by ERPNext</a>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user