remotes/origin/artem
Gena 11 years ago
parent d8a3517c4b
commit 1dc43ec164
  1. 2
      batiskaf/jinja2_ext/thumbnails.py
  2. 1
      batiskaf/settings.py
  3. 36
      static/js/_.js
  4. 8
      store/admin.py

@ -3,5 +3,5 @@ from easy_thumbnails.files import get_thumbnailer
def thumbnail(img, size='420x420'): def thumbnail(img, size='420x420'):
weight, height = size.split('x') weight, height = size.split('x')
options = {'size': (int(weight), int(height)), 'crop': 'upscale'} options = {'size': (int(weight), int(height))}
return get_thumbnailer(img).get_thumbnail(options) return get_thumbnailer(img).get_thumbnail(options)

@ -17,7 +17,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
ADMINS = ( ADMINS = (
('spacenergy', 'spacenergy@me.com'), ('spacenergy', 'spacenergy@me.com'),
) )
MANAGERS = ADMINS MANAGERS = ADMINS

@ -66,7 +66,7 @@ $(document).ready(function () {
}); });
$('.product-min-thumbnails a').each(function(){ $('.product-min-thumbnails a').each(function(){
var link = $(this); var link = $(this);
link.on('click', function(){ link.on('click', function(){
$('.product-big-thumbnail img').prop('src', link.prop('href')); $('.product-big-thumbnail img').prop('src', link.prop('href'));
@ -75,15 +75,15 @@ $(document).ready(function () {
//$('a#product-big-image-url').prop('href', link.attr('data-big-url')) //$('a#product-big-image-url').prop('href', link.attr('data-big-url'))
return false; return false;
}) })
}); });
$('.product-big-thumbnail-container').zoom({url: $('#product-big-image-url').prop("href")}); $('.product-big-thumbnail-container').zoom({url: $('#product-big-image-url').prop("href")});
function create_cart_add_link(product_pk, count){ function create_cart_add_link(product_pk, count){
return $.param.querystring('/store/cart/add/', 'pk=' + product_pk + '&count=' + count + '&next=' + window.location.pathname); return $.param.querystring('/store/cart/add/', 'pk=' + product_pk + '&count=' + count + '&next=' + window.location.pathname);
} }
function selectVariation(value, index){ function selectVariation(value, index){
var price = $('.product-variations-selecter option[value=' + value + ']').attr('data-price'); var price = $('.product-variations-selecter option[value=' + value + ']').attr('data-price');
var in_stock = $('.product-variations-selecter option[value=' + value + ']').attr('data-count'); var in_stock = $('.product-variations-selecter option[value=' + value + ']').attr('data-count');
$('.product-detail-price-span').html(price); $('.product-detail-price-span').html(price);
@ -110,35 +110,35 @@ $(document).ready(function () {
$('.product-not-in-stock').show(); $('.product-not-in-stock').show();
} }
} }
$(".product-variations-selecter").selecter({ $(".product-variations-selecter").selecter({
callback: selectVariation callback: selectVariation
}); });
function selectCount(value, index){ function selectCount(value, index){
var price = parseInt($('.product-detail-price-span').html()); var price = parseInt($('.product-detail-price-span').html());
$('.itogo-span').html(price*value); $('.itogo-span').html(price*value);
$('#product-add-to-cart-link').prop('href', $('#product-add-to-cart-link').prop('href',
create_cart_add_link($('.product-variations-selecter').val(), create_cart_add_link($('.product-variations-selecter').val(),
$('.product-count-selecter').val())); $('.product-count-selecter').val()));
} }
$(".product-count-selecter").selecter({ $(".product-count-selecter").selecter({
callback: selectCount callback: selectCount
}); });
if ($('.product-count-selecter option').size() < 1){ if ($('.product-count-selecter option').size() < 1){
$('.product-in-stock').hide(); $('.product-in-stock').hide();
$('.product-not-in-stock').show(); $('.product-not-in-stock').show();
}else{ }else{
$(".product-count-selecter").selecter(); $(".product-count-selecter").selecter();
} }
$('ul.messages li').each(function(){ $('ul.messages li').each(function(){
var li = $(this); var li = $(this);
var messageType = li.attr('data-type'); var messageType = li.attr('data-type');
swal({ swal({
@ -148,7 +148,7 @@ $(document).ready(function () {
text: li.html() text: li.html()
}); });
}); });

@ -24,7 +24,13 @@ class BrandAdmin(admin.ModelAdmin):
@admin.register(Category) @admin.register(Category)
class CategoryAdmin(admin.ModelAdmin): class CategoryAdmin(admin.ModelAdmin):
list_display = ('title',)
def get_str(object):
return object.__str__()
get_str.short_description = 'Полный путь'
list_display = ('title', get_str,)
prepopulated_fields = {"slug": ("title",)} prepopulated_fields = {"slug": ("title",)}
inlines = [AttributeForCategoryInline, ] inlines = [AttributeForCategoryInline, ]

Loading…
Cancel
Save