Skip to content

Commit

Permalink
Merge branch 'release/3.4.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarunbhardwaj
tarunbhardwaj committed Apr 30, 2015
2 parents 4cfc713 + 1516578 commit ab922cd
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 73 deletions.
59 changes: 33 additions & 26 deletions static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,46 +751,30 @@ a.social-links{
}
a.social-links i {
display: block;
width: 42px;
height: 42px;
border: 1px solid #B4B4B4;
border-radius: 3px;
width: 38px;
height: 38px;
border-radius: 50%;
margin: 0 auto 20px auto;
background:#373435 url(../images/social.png) no-repeat 0 0;
-webkit-transition: all ease 0.3s;
-moz-transition: all ease 0.3s;
transition: all ease 0.3s;
background-color: #2e2f33;
line-height: 38px;
font-size: 20px;
color: #fff;
}
a.social-links.facebook i {
background-position: 0 0;
}
a.social-links.facebook i:hover{
background-color: #3B5998;
}
a.social-links.twitter i:hover{
background-color: #4099FF;
}
a.social-links.twitter i {
background-position: 0 -42px;
background-color: #4099FF;
}
a.social-links.googleplus i {
background-position: 0 -84px;
}
a.social-links.googleplus i:hover {
background-color: #FF5C00;
background-color: #dd4b39;
}
a.social-links.pinterest i {
background-position: 0 -126px;
}
a.social-links.pinterest i:hover {
background-color: #C92228;
}
a.social-links.youtube i{
background-position: 0 -164px;
}
a.social-links.youtube i:hover{
background-color: #da2720;
}
.payment-gateway img{
max-width: 50px;
}
Expand Down Expand Up @@ -1769,7 +1753,7 @@ h3.product-item-name{
height: 50px
}
.checkout-step-number.done {
background-color: #f0ad4e;
background-color: #06A1DA;
}
.no-pad{
padding: 0;
Expand All @@ -1780,6 +1764,23 @@ h3.product-item-name{
.margin-auto{
margin: auto;
}
.news-letter-section{
padding: 15px 0;
}
.news-letter-section .input-group-btn .btn {
background-color: #3397DA;
}
.related-product-images{
height: 200px;
position: relative;
line-height: 200px;
}
.related-product-images img{
vertical-align: middle;
}
.btn-related-item-add-cart{
margin: 10px 0 20px 0;
}
.order-detail-description .panel-default > .panel-heading{
background: transparent;
}
Expand All @@ -1789,4 +1790,10 @@ h3.product-item-name{
}
.order-payment-panel .panel-heading{
padding: 10px 0px;
}
.checkout-step a:hover{
color: #06A1DA;
}
.checkout-step-number.done:hover > a{
color: #fff;
}
46 changes: 25 additions & 21 deletions templates/webshop/base.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,29 @@
<!--Footer Links blocks Starts-->
<footer>
<div class="container">
<hr>
<div class="row news-letter-section">
<div class="subscribe-block">
<div class="col-md-5 text-right text-center-xs">
<h4>Sign up for our Newsletter alerts</h4>
</div>
<div class="col-md-4">
<!--Subscribe form-->
<form autocomplete="off">
<div class="input-group">
<input type="text" class="form-control" placeholder="you@mail.com">
<span class="input-group-btn">
<button class="btn btn-info" type="button"><i class="fa fa-plus"></i></button>
</span>
</div>
</form>
</div>
</div>
</div>
<hr>
<!--First Row-->
{% if request.nereid_website.cms_root_footer %}
<div class="row">
<div class="row text-center-xs">
<!-- Site Navigation and root links -->
{% set footer_menuitem = request.nereid_website.cms_root_footer.get_menu_item(max_depth=10) %}
{% for child in footer_menuitem.children %}
Expand All @@ -270,33 +289,18 @@
<div class="col-md-{{ 12 - 2 * (footer_menuitem.children|length) }} social-block">
<div class="row">
<h4>Social</h4>
<a href="" class="social-links facebook"><i></i></a>
<a href="" class="social-links twitter"><i></i></a>
<a href="" class="social-links googleplus"><i></i></a>
<a href="" class="social-links pinterest"><i></i></a>
<a href="" class="social-links youtube"><i></i></a>
</div>
<div class="row">
<div class="subscribe-block">
<h5>Sign Up for the Newsletter</h5>
<!--Subscribe form-->
<form autocomplete="off">
<div class="input-group">
<input type="text" class="form-control" placeholder="you@mail.com">
<span class="input-group-btn">
<button class="btn btn-danger" type="button"><i class="fa fa-plus"></i></button>
</span>
</div>
</form>
</div>
<a href="" class="social-links facebook"><i class="fa fa-facebook"></i></a>
<a href="" class="social-links twitter"><i class="fa fa-twitter"></i></a>
<a href="" class="social-links googleplus"><i class="fa fa-google-plus"></i></a>
<a href="" class="social-links pinterest"><i class="fa fa-pinterest"></i></a>
</div>
</div>
</div>
<hr>
{% endif %}
<!-- Second Row -->
<div class="row">
<div class="col-md-8 payment-gateway">
<div class="col-md-12 text-center payment-gateway">
<h4>Payment Gateway</h4>
<ul class="list-inline">
<li>
Expand Down
6 changes: 3 additions & 3 deletions templates/webshop/checkout/base.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<li class="checkout-step">
<div class="checkout-step-number {% if checkout_step >= 1 %}done{% endif %}">
<a href="{{ url_for('nereid.checkout.sign_in') }}">
<span>1</span>
<span><i class="fa fa-shopping-cart"></i></span>
</a>
</div>
<span class="checkout-step-name">{{ _('Sign In') }}</span>
Expand All @@ -50,7 +50,7 @@
<li class="checkout-step">
<div class="checkout-step-number {% if checkout_step >= 2 %}done{% endif %}">
<a href="{{ url_for('nereid.checkout.shipping_address') }}">
<span>2</span>
<span><i class="fa fa-truck"></i></span>
</a>
</div>
<span class="checkout-step-name">{{ _('Delivery') }}</span>
Expand All @@ -59,7 +59,7 @@
<li class="checkout-step">
<div class="checkout-step-number {% if checkout_step >= 3 %}done{% endif %}">
<a href="{{ url_for('nereid.checkout.payment_method') }}">
<span>3</span>
<span><i class="fa fa-credit-card"></i></span>
</a>
</div>
<span class="checkout-step-name">{{ _('Payment') }}</span>
Expand Down
41 changes: 20 additions & 21 deletions templates/webshop/product.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,50 +228,49 @@

{% block related_products %}
<!-- Related Products -->
<div class="{% if cross_sells %} col-md-5 col-sm-5 {% else %} hidden {% endif %} related-prod">
<div class="{% if cross_sells %} col-md-12 col-sm-12 {% else %} hidden {% endif %} related-prod">
{# heading for column #}
<h4>Related Items</h4>

<div class="row related-product-row text-center">
{% for related_product in cross_sells %}
<div class="row related-product-row">

<div class="col-md-3">
<a class="media-left" href="{{ related_product.get_absolute_url() }}" ga-product-link data-ga-product-list="Related Products" data-ga-event-label="Product Thumbnail" data-ga-product-id="{{ related_product.id }}" data-ga-product-name="{{ related_product.name }}" data-ga-product-category="{{ related_product.category and related_product.category.name or None }}">
<img src="{{ CDN }}{{ related_product.default_image.transform_command().thumbnail(100, 100, 'a') }}" class="img" alt="{{ related_product.name }}">
</a>
</div>
<div class="col-md-9">
<h5 class="media-heading">
<div class="related-product-images">
<a href="{{ related_product.get_absolute_url() }}" ga-product-link data-ga-product-list="Related Products" data-ga-event-label="Product Thumbnail" data-ga-product-id="{{ related_product.id }}" data-ga-product-name="{{ related_product.name }}" data-ga-product-category="{{ related_product.category and related_product.category.name or None }}">
<img src="{{ CDN }}{{ related_product.default_image.transform_command().thumbnail(200, 200, 'a') }}" class="img margin-auto" alt="{{ related_product.name }}">
</a>
</div>
<h4>
<a href="{{ related_product.get_absolute_url() }}" ga-product-link data-ga-product-list="Related Products" data-ga-event-label="Product Name" data-ga-product-id="{{ related_product.id }}" data-ga-product-name="{{ related_product.name }}" data-ga-product-category="{{ related_product.category and related_product.category.name or None }}">
{{ related_product.name }}
</a>
</h5>
</h4>
<span class="text-muted related-cost">
<strong>{{ related_product.sale_price(1)|currencyformat(request.nereid_currency.code) }}</strong>
</span>
<div class="row">
<span class="col-md-12">
{% if related_product.salable %}
{% if related_product.is_gift_card %}
<a class="btn btn-related-item-add-cart" href="{{ related_product.get_absolute_url() }}">Add to Cart</a>
<a class="btn btn-related-item-add-cart" href="{{ related_product.get_absolute_url() }}">Add to Cart</a>
{% else %}
<form action="{{ url_for("nereid.cart.add_to_cart") }}" method="post" id="product-buy-now" autocomplete="off" class="form-related-inline add-to-cart" data-ga-event-label="Add To Cart Related Product" data-ga-product-name="{{ related_product.name }}" data-ga-product-category="{{ related_product.category and related_product.category.name or None }}" data-ga-product-price="{{ related_product.sale_price()|currencyformat(request.nereid_currency.code) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<input type="hidden" name="quantity" value="1"/>
<input type="hidden" name="size" id="size-id"/>
<input type="hidden" name="product" value="{{ related_product.id }}"/>
<input type="hidden" name="action" value="add"/>
<button class="btn btn-related-item-add-cart" type="submit" quantity="1" id="buy-now-btn">Add to Cart</button>
</form>
<form action="{{ url_for("nereid.cart.add_to_cart") }}" method="post" id="product-buy-now" autocomplete="off" class="form-related-inline related-products add-to-cart" data-ga-event-label="Add To Cart Related Product" data-ga-product-name="{{ related_product.name }}" data-ga-product-category="{{ related_product.category and related_product.category.name or None }}" data-ga-product-price="{{ related_product.sale_price()|currencyformat(request.nereid_currency.code) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<input type="hidden" name="quantity" value="1"/>
<input type="hidden" name="size" id="size-id"/>
<input type="hidden" name="product" value="{{ related_product.id }}"/>
<input type="hidden" name="action" value="add"/>
<button class="btn btn-related-item-add-cart" type="submit" quantity="1" id="buy-now-btn">Add to Cart</button>
</form>
{% endif %}
{% else %}
<span class="text-danger" id="product-not-for-sale"><i class="fa fa-warning"></i>This product is not for sale</span>
{% endif %}
</span>
</div>
</div>
</div>
<hr/>
{% endfor %}
</div>
</div>
{% endblock related_products %}

Expand Down
2 changes: 1 addition & 1 deletion templates/webshop/sale.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
</form>
<button name="save-comment" class="btn btn-primary col-md-3 pull-right margin-top-30" id="add-comment" data-url="{{ url_for('sale.sale.add_comment_to_sale', active_id=sale.id, access_code=sale.guest_access_code) }}">{{ _('Save') }}</button>
</div>
{% else %}
{% elif sale.comment %}
<h5> <span class="text-muted">Note: </span>&nbsp;{{ sale.comment }}</h5>
{% endif %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion tryton.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tryton]
version=3.4.1.3
version=3.4.1.4
depends:
nereid
nereid_cms
Expand Down

0 comments on commit ab922cd

Please sign in to comment.