diff --git a/import_xls/excel_settings.py b/import_xls/excel_settings.py index 5deffad0..43b583a5 100644 --- a/import_xls/excel_settings.py +++ b/import_xls/excel_settings.py @@ -20,6 +20,8 @@ def get_place(place): def get_theme(value): + if isinstance(value, Theme): + return str(value.id) theme_ids = [str(item['id']) for item in value.all().values('id')] return ','.join(theme_ids) diff --git a/static/templates/expo/img/letterdesign/pix.gif b/static/templates/expo/img/letterdesign/pix.gif new file mode 100644 index 00000000..3a469695 Binary files /dev/null and b/static/templates/expo/img/letterdesign/pix.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_contakt.gif b/static/templates/expo/img/letterdesign/vl_icon_contakt.gif new file mode 100644 index 00000000..7f0746b0 Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_contakt.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_doodle.gif b/static/templates/expo/img/letterdesign/vl_icon_doodle.gif new file mode 100644 index 00000000..da6fc06a Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_doodle.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_facebook.gif b/static/templates/expo/img/letterdesign/vl_icon_facebook.gif new file mode 100644 index 00000000..432d38cd Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_facebook.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_mail.gif b/static/templates/expo/img/letterdesign/vl_icon_mail.gif new file mode 100644 index 00000000..dab373d3 Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_mail.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_rss.gif b/static/templates/expo/img/letterdesign/vl_icon_rss.gif new file mode 100644 index 00000000..83a37f65 Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_rss.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_icon_twitter.gif b/static/templates/expo/img/letterdesign/vl_icon_twitter.gif new file mode 100644 index 00000000..11392b3c Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_icon_twitter.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_logo.gif b/static/templates/expo/img/letterdesign/vl_logo.gif new file mode 100644 index 00000000..1756ebec Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_logo.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_logo_ny.gif b/static/templates/expo/img/letterdesign/vl_logo_ny.gif new file mode 100644 index 00000000..4cb912eb Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_logo_ny.gif differ diff --git a/static/templates/expo/img/letterdesign/vl_nameleft.gif b/static/templates/expo/img/letterdesign/vl_nameleft.gif new file mode 100644 index 00000000..6a8b82be Binary files /dev/null and b/static/templates/expo/img/letterdesign/vl_nameleft.gif differ diff --git a/templates/client/404_test.html b/templates/client/404_test.html new file mode 100644 index 00000000..86f72a87 --- /dev/null +++ b/templates/client/404_test.html @@ -0,0 +1,18 @@ +{% extends 'base_catalog.html' %} + +{% block content_list %} + + + + +{% endblock %} \ No newline at end of file diff --git a/templates/client/robots.txt b/templates/client/robots.txt index 03e0caf4..de54334f 100644 --- a/templates/client/robots.txt +++ b/templates/client/robots.txt @@ -1,4 +1,5 @@ User-agent: * +Disallow: /templates/ Disallow: /profile/ Disallow: /export/ Disallow: /download/ @@ -97,6 +98,7 @@ Disallow: /*/serv-catalogs-info.php Sitemap: http://expomap.ru/sitemap.xml User-agent: Googlebot +Disallow: /templates/ Disallow: /profile/ Disallow: /export/ Disallow: /download/ @@ -195,6 +197,7 @@ Disallow: /*/serv-catalogs-info.php Sitemap: http://expomap.ru/sitemap.xml User-agent: Yandex +Disallow: /templates/ Disallow: /profile/ Disallow: /export/ Disallow: /download/