From 2c28e0a4e9dd3f87fab38d7b9f6dfd001d7f71b3 Mon Sep 17 00:00:00 2001 From: kotzilla Date: Tue, 16 Sep 2014 07:55:05 +0000 Subject: [PATCH] 16.09 --- accounts/urls.py | 6 + accounts/views.py | 1 + article/admin_urls.py | 10 +- core/views.py | 4 +- country/models.py | 23 + exposition/manager.py | 20 + exposition/models.py | 88 +- functions/admin_forms.py | 16 + functions/admin_views.py | 62 + functions/custom_views.py | 4 +- functions/search_forms.py | 153 +- photologue/admin.py | 3 + photologue/forms.py | 11 +- .../commands/photologue_exposize.py | 26 + photologue/models.py | 23 +- photoreport/models.py | 12 - place_exposition/admin.py | 71 +- place_exposition/admin_urls.py | 7 +- place_exposition/forms.py | 5 +- .../management/commands/convert_photo.py | 61 + place_exposition/models.py | 35 + proj/settings.py | 26 +- proj/urls.py | 9 +- settings/templatetags/template_filters.py | 10 +- static/client | 1 + .../css/idangerous.swiper.css | 0 .../css/idangerous.swiper.scrollbar.css | 0 .../css/jquery-ui-1.10.3.custom.css | 0 .../css/jquery.fancybox.css | 0 .../css/jquery.mCustomScrollbar.css | 0 static/{client => client.old}/css/main.css | 0 .../{client => client.old}/css/normalize.css | 0 .../css/normalize.min.css | 0 .../css/pages/exposition_by.css | 0 .../{client => client.old}/css/phototag.css | 0 static/{client => client.old}/css/regions.css | 0 static/{client => client.old}/css/select2.css | 0 .../fonts/pfdindisplaypro-bold-webfont.eot | Bin .../fonts/pfdindisplaypro-bold-webfont.svg | 0 .../fonts/pfdindisplaypro-bold-webfont.ttf | Bin .../fonts/pfdindisplaypro-bold-webfont.woff | Bin .../fonts/pfdindisplaypro-italic-webfont.eot | Bin .../fonts/pfdindisplaypro-italic-webfont.svg | 0 .../fonts/pfdindisplaypro-italic-webfont.ttf | Bin .../fonts/pfdindisplaypro-italic-webfont.woff | Bin .../fonts/pfdindisplaypro-light-webfont.eot | Bin .../fonts/pfdindisplaypro-light-webfont.svg | 0 .../fonts/pfdindisplaypro-light-webfont.ttf | Bin .../fonts/pfdindisplaypro-light-webfont.woff | Bin .../fonts/pfdindisplaypro-med-webfont.eot | Bin .../fonts/pfdindisplaypro-med-webfont.svg | 0 .../fonts/pfdindisplaypro-med-webfont.ttf | Bin .../fonts/pfdindisplaypro-med-webfont.woff | Bin .../fonts/pfdindisplaypro-reg-webfont.eot | Bin .../fonts/pfdindisplaypro-reg-webfont.svg | 0 .../fonts/pfdindisplaypro-reg-webfont.ttf | Bin .../fonts/pfdindisplaypro-reg-webfont.woff | Bin .../fonts/pfdindisplaypro-thin-webfont.eot | Bin .../fonts/pfdindisplaypro-thin-webfont.svg | 0 .../fonts/pfdindisplaypro-thin-webfont.ttf | Bin .../fonts/pfdindisplaypro-thin-webfont.woff | Bin .../fonts/pts55f-webfont.eot | Bin .../fonts/pts55f-webfont.ttf | Bin .../fonts/pts55f-webfont.woff | Bin .../fonts/pts75f-webfont.eot | Bin .../fonts/pts75f-webfont.ttf | Bin .../fonts/pts75f-webfont.woff | Bin static/{client => client.old}/img/1.png | Bin static/{client => client.old}/img/2.png | Bin static/{client => client.old}/img/Thumbs.db | Bin .../img/_del-temp/Thumbs.db | Bin .../img/_del-temp/banner-2.gif | Bin .../img/_del-temp/banner.gif | Bin .../img/_del-temp/bnrs-2.jpg | Bin .../img/_del-temp/bnrs.jpg | Bin .../img/_del-temp/cl-logo-1.png | Bin .../img/_del-temp/cl-logo-2.png | Bin .../img/_del-temp/cl-logo-3.png | Bin .../img/_del-temp/counter-1.gif | Bin .../img/_del-temp/counter-2.gif | Bin .../img/_del-temp/counter-3.gif | Bin .../img/_del-temp/editor.png | Bin .../img/_del-temp/event-photo-1.jpg | Bin .../img/_del-temp/expo-bn-1.jpg | Bin .../img/_del-temp/expo-bn-2-s.jpg | Bin .../img/_del-temp/glr-1.jpg | Bin .../img/_del-temp/hotel-1.jpg | Bin .../img/_del-temp/mail-banner.jpg | Bin .../img/_del-temp/mp-phg-1.jpg | Bin .../img/_del-temp/mp-phg-1.png | Bin .../img/_del-temp/news-1.jpg | Bin .../img/_del-temp/news-s-1.jpg | Bin .../img/_del-temp/part-logo-1.png | Bin .../img/_del-temp/part-logo-2.png | Bin .../img/_del-temp/part-logo-3.png | Bin .../img/_del-temp/pg-1.jpg | Bin .../img/_del-temp/pg-2.jpg | Bin .../img/_del-temp/pg-3.jpg | Bin .../img/_del-temp/pg-4.jpg | Bin .../img/_del-temp/phr-1.jpg | Bin .../img/_del-temp/phr-2.jpg | Bin .../img/_del-temp/phr-3.jpg | Bin .../img/_del-temp/phr-4.jpg | Bin .../img/_del-temp/pl-logo-1.png | Bin .../img/_del-temp/pl-logo-2.png | Bin .../img/_del-temp/place-photo-1.jpg | Bin .../img/_del-temp/plan.jpg | Bin .../img/_del-temp/pt-logo-1.png | Bin .../img/_del-temp/pt-logo-2.png | Bin .../img/_del-temp/pt-logo-3.png | Bin .../img/_del-temp/pt-logo-4.png | Bin .../img/_del-temp/pt-logo-5.png | Bin .../img/_del-temp/pt-logo-6.png | Bin .../img/_del-temp/request-catalog.png | Bin .../img/_del-temp/request-participation.png | Bin .../img/_del-temp/request-remotely.png | Bin .../img/_del-temp/request-tickets.png | Bin .../img/_del-temp/request-tour.png | Bin .../img/_del-temp/request-translator.png | Bin .../img/_del-temp/review-1.jpg | Bin .../img/_del-temp/review-2.jpg | Bin .../img/_del-temp/s-map.jpg | Bin .../img/_del-temp/usr-1.jpg | Bin .../img/_del-temp/usr-2.jpg | Bin .../img/_del-temp/video.jpg | Bin .../img/_del-temp/vk-widget.jpg | Bin .../img/_del-temp/yad.jpg | Bin .../{client => client.old}/img/about_pic.png | Bin .../img/ad-themes/Thumbs.db | Bin .../img/ad-themes/adt-1.png | Bin .../img/ad-themes/adt-2.png | Bin .../img/ad-themes/adt-3.png | Bin .../img/add_link_text.png | Bin .../img/add_pic_block_bg.png | Bin .../img/add_pic_block_bg1.png | Bin .../img/add_pic_block_bg2.png | Bin static/{client => client.old}/img/ag-bg.png | Bin .../img/approved-logo.png | Bin .../{client => client.old}/img/blog_pic.jpg | Bin .../{client => client.old}/img/blog_pic1.jpg | Bin .../{client => client.old}/img/blog_pic2.jpg | Bin static/{client => client.old}/img/clock.png | Bin .../img/fancybox/Thumbs.db | Bin .../img/fancybox/blank.gif | Bin .../img/fancybox/fancybox_loading.gif | Bin .../img/fancybox/fancybox_loading@2x.gif | Bin .../img/fancybox/fancybox_overlay.png | Bin .../img/fancybox/fancybox_sprite.png | Bin .../img/fancybox/fancybox_sprite@2x.png | Bin static/{client => client.old}/img/favicon.ico | Bin static/{client => client.old}/img/female.png | Bin static/{client => client.old}/img/libk_bg.png | Bin static/{client => client.old}/img/logo.png | Bin .../img/mail-logo-2.jpg | Bin static/{client => client.old}/img/male.png | Bin static/{client => client.old}/img/map.png | Bin static/{client => client.old}/img/no-logo.jpg | Bin static/{client => client.old}/img/no-logo.png | Bin .../img/partners/Thumbs.db | Bin .../img/partners/deutsche-messe.png | Bin .../img/partners/expocentr.png | Bin .../img/partners/expoforum.png | Bin .../img/partners/ite.png | Bin .../img/partners/messe-frankfurt.png | Bin static/{client => client.old}/img/pic1.jpg | Bin static/{client => client.old}/img/pic10.jpg | Bin static/{client => client.old}/img/pic11.jpg | Bin static/{client => client.old}/img/pic12.png | Bin static/{client => client.old}/img/pic13.jpg | Bin static/{client => client.old}/img/pic14.jpg | Bin static/{client => client.old}/img/pic15.jpg | Bin static/{client => client.old}/img/pic16.jpg | Bin static/{client => client.old}/img/pic2.jpg | Bin static/{client => client.old}/img/pic3.jpg | Bin static/{client => client.old}/img/pic4.jpg | Bin static/{client => client.old}/img/pic5.jpg | Bin static/{client => client.old}/img/pic6.jpg | Bin static/{client => client.old}/img/pic7.jpg | Bin static/{client => client.old}/img/pic8.jpg | Bin static/{client => client.old}/img/pic8.png | Bin static/{client => client.old}/img/pic9.jpg | Bin static/{client => client.old}/img/pin.png | Bin .../{client => client.old}/img/search-bg.jpg | Bin static/{client => client.old}/img/select.png | Bin .../img/semitransparent-ie8.png | Bin .../{client => client.old}/img/signature.png | Bin .../img/soc-medias/Thumbs.db | Bin .../img/soc-medias/icon-fb.png | Bin .../img/soc-medias/icon-fb_hover.png | Bin .../img/soc-medias/icon-goog.png | Bin .../img/soc-medias/icon-lin.png | Bin .../img/soc-medias/icon-lin_hover.png | Bin .../img/soc-medias/icon-mailr.png | Bin .../img/soc-medias/icon-ok.png | Bin .../img/soc-medias/icon-twit.png | Bin .../img/soc-medias/icon-vk.png | Bin .../img/soc-medias/icon-yand.png | Bin .../img/soc-medias/sm-icon-fb-w.png | Bin .../img/soc-medias/sm-icon-fb.png | Bin .../img/soc-medias/sm-icon-lin-w.png | Bin .../img/soc-medias/sm-icon-lin.png | Bin .../img/soc-medias/sm-icon-rss.png | Bin .../img/soc-medias/sm-icon-twit-w.png | Bin .../img/soc-medias/sm-icon-twit.png | Bin .../img/soc-medias/sm-icon-twit_hover.png | Bin .../img/soc-medias/sm-icon-vk-w.png | Bin .../img/soc-medias/sm-icon-vk.png | Bin .../img/soc-medias/sm-icon-vk_hover.png | Bin static/{client => client.old}/img/soc.png | Bin static/{client => client.old}/img/space.png | Bin static/{client => client.old}/img/spacer.gif | Bin static/{client => client.old}/img/sprites.png | Bin .../img/subjects_list.png | Bin .../img/themes/Thumbs.db | Bin .../img/themes/expo-1.png | Bin .../img/themes/expo-2.png | Bin .../img/themes/expo-3.png | Bin static/{client => client.old}/img/wait.gif | Bin static/{client => client.old}/img/wether.png | Bin static/{client => client.old}/img/x2.png | Bin .../js/existing-tags.js | 0 static/{client => client.old}/js/gmap.js | 0 .../js/idangerous.swiper-2.4.min.js | 0 .../js/jquery-ui-1.10.3.custom.min.js | 0 .../js/jquery-ui-1.10.4.custom.min.js | 0 .../js/jquery.fancybox.pack.js | 0 .../js/jquery.mCustomScrollbar.min.js | 0 .../js/jquery.mousewheel.min.js | 0 .../js/jquery.phototag.js | 0 .../js/jquery.placeholder.js | 0 .../js/jquery.ui.datepicker-ru.js | 0 static/{client => client.old}/js/main.js | 0 .../js/pages/complete_registration.js | 0 .../js/pages/profile.js | 0 .../js/pages/profile_company.js | 0 static/{client => client.old}/js/plugins.js | 0 .../js/plugins/select2.min.js | 0 .../js/plugins/select2_locale_ru.js | 0 static/{client => client.old}/js/regions.js | 0 static/{client => client.old}/js/scripts.js | 0 .../js/selectivizr-min.js | 0 .../{client => client.old}/js/sendfilter.js | 0 .../js/vendor/jquery-1.10.1.min.js | 0 .../modernizr-2.6.2-respond-1.1.0.min.js | 0 templates/admin/accounts/user_all.html | 12 +- templates/admin/base.html | 2 + templates/admin/city/city_all.html | 12 +- templates/admin/company/company_all.html | 12 +- .../admin/conference/conference_all.html | 12 +- templates/admin/country/country_all.html | 31 +- .../admin/exposition/exposition_all.html | 37 +- .../admin/includes/admin_pagination.html | 12 + templates/admin/organiser/organiser_all.html | 12 +- .../photogallery/admin_gallery_list.html | 3 +- .../admin/photogallery/admin_photo_list.html | 1 + .../place_conference_all.html | 14 +- .../place_exposition/place_exposition.html | 476 + .../place_exposition_add.html | 18 + .../place_exposition_all.html | 13 +- templates/admin/seminar/seminar_all.html | 12 +- templates/admin/service/service_all.html | 11 - templates/admin/theme/tag_all.html | 12 +- templates/admin/theme/theme_all.html | 12 +- .../admin/translator/translator_all.html | 12 +- templates/admin/webinar/webinar_all.html | 12 +- templates/client/accounts/fill_company.html | 167 +- templates/client/accounts/new_profile.html | 118 +- templates/client/accounts/profile.html | 40 +- templates/client/blank.html | 2 +- templates/client/includes/catalog_search.html | 6 +- templates/client/includes/paginator.html | 47 + .../client/includes/place/place_list.html | 2 +- .../client/includes/place/place_object.html | 12 +- templates/client/place/place_photo.html | 33 +- templates/client/popups/period.html | 2 +- templates/client/popups/place.html | 17 +- templates/client/popups/theme.html | 9 +- .../static_client/css/idangerous.swiper.css | 118 + .../css/idangerous.swiper.scrollbar.css | 16 + .../css/jquery-ui-1.10.3.custom.css | 163 + .../static_client/css/jquery.fancybox.css | 274 + .../css/jquery.mCustomScrollbar.css | 474 + templates/client/static_client/css/main.css | 12062 ++++++++++++++++ .../client/static_client/css/normalize.css | 527 + .../static_client/css/normalize.min.css | 1 + .../static_client/css/pages/exposition_by.css | 24 + .../client/static_client/css/phototag.css | 215 + .../client/static_client/css/regions.css | 75 + .../client/static_client/css/select2.css | 637 + .../fonts/pfdindisplaypro-bold-webfont.eot | Bin 0 -> 24644 bytes .../fonts/pfdindisplaypro-bold-webfont.svg | 530 + .../fonts/pfdindisplaypro-bold-webfont.ttf | Bin 0 -> 52880 bytes .../fonts/pfdindisplaypro-bold-webfont.woff | Bin 0 -> 27044 bytes .../fonts/pfdindisplaypro-italic-webfont.eot | Bin 0 -> 32349 bytes .../fonts/pfdindisplaypro-italic-webfont.svg | 547 + .../fonts/pfdindisplaypro-italic-webfont.ttf | Bin 0 -> 70624 bytes .../fonts/pfdindisplaypro-italic-webfont.woff | Bin 0 -> 35544 bytes .../fonts/pfdindisplaypro-light-webfont.eot | Bin 0 -> 25525 bytes .../fonts/pfdindisplaypro-light-webfont.svg | 530 + .../fonts/pfdindisplaypro-light-webfont.ttf | Bin 0 -> 55168 bytes .../fonts/pfdindisplaypro-light-webfont.woff | Bin 0 -> 27984 bytes .../fonts/pfdindisplaypro-med-webfont.eot | Bin 0 -> 24741 bytes .../fonts/pfdindisplaypro-med-webfont.svg | 530 + .../fonts/pfdindisplaypro-med-webfont.ttf | Bin 0 -> 53596 bytes .../fonts/pfdindisplaypro-med-webfont.woff | Bin 0 -> 27124 bytes .../fonts/pfdindisplaypro-reg-webfont.eot | Bin 0 -> 24655 bytes .../fonts/pfdindisplaypro-reg-webfont.svg | 530 + .../fonts/pfdindisplaypro-reg-webfont.ttf | Bin 0 -> 54004 bytes .../fonts/pfdindisplaypro-reg-webfont.woff | Bin 0 -> 26940 bytes .../fonts/pfdindisplaypro-thin-webfont.eot | Bin 0 -> 25084 bytes .../fonts/pfdindisplaypro-thin-webfont.svg | 530 + .../fonts/pfdindisplaypro-thin-webfont.ttf | Bin 0 -> 53796 bytes .../fonts/pfdindisplaypro-thin-webfont.woff | Bin 0 -> 27456 bytes .../static_client/fonts/pts55f-webfont.eot | Bin 0 -> 64258 bytes .../static_client/fonts/pts55f-webfont.ttf | Bin 0 -> 184700 bytes .../static_client/fonts/pts55f-webfont.woff | Bin 0 -> 82212 bytes .../static_client/fonts/pts75f-webfont.eot | Bin 0 -> 65466 bytes .../static_client/fonts/pts75f-webfont.ttf | Bin 0 -> 184436 bytes .../static_client/fonts/pts75f-webfont.woff | Bin 0 -> 82372 bytes templates/client/static_client/img/1.png | Bin 0 -> 1438 bytes templates/client/static_client/img/2.png | Bin 0 -> 1395 bytes templates/client/static_client/img/Thumbs.db | Bin 0 -> 119808 bytes .../static_client/img/_del-temp/Thumbs.db | Bin 0 -> 454144 bytes .../static_client/img/_del-temp/banner-2.gif | Bin 0 -> 5190 bytes .../static_client/img/_del-temp/banner.gif | Bin 0 -> 4569 bytes .../static_client/img/_del-temp/bnrs-2.jpg | Bin 0 -> 10590 bytes .../static_client/img/_del-temp/bnrs.jpg | Bin 0 -> 4155 bytes .../static_client/img/_del-temp/cl-logo-1.png | Bin 0 -> 4629 bytes .../static_client/img/_del-temp/cl-logo-2.png | Bin 0 -> 8390 bytes .../static_client/img/_del-temp/cl-logo-3.png | Bin 0 -> 10635 bytes .../static_client/img/_del-temp/counter-1.gif | Bin 0 -> 250 bytes .../static_client/img/_del-temp/counter-2.gif | Bin 0 -> 1643 bytes .../static_client/img/_del-temp/counter-3.gif | Bin 0 -> 1499 bytes .../static_client/img/_del-temp/editor.png | Bin 0 -> 5568 bytes .../img/_del-temp/event-photo-1.jpg | Bin 0 -> 123235 bytes .../static_client/img/_del-temp/expo-bn-1.jpg | Bin 0 -> 19264 bytes .../img/_del-temp/expo-bn-2-s.jpg | Bin 0 -> 4540 bytes .../static_client/img/_del-temp/glr-1.jpg | Bin 0 -> 130635 bytes .../static_client/img/_del-temp/hotel-1.jpg | Bin 0 -> 6235 bytes .../img/_del-temp/mail-banner.jpg | Bin 0 -> 1661 bytes .../static_client/img/_del-temp/mp-phg-1.jpg | Bin 0 -> 63514 bytes .../static_client/img/_del-temp/mp-phg-1.png | Bin 0 -> 458990 bytes .../static_client/img/_del-temp/news-1.jpg | Bin 0 -> 4916 bytes .../static_client/img/_del-temp/news-s-1.jpg | Bin 0 -> 6250 bytes .../img/_del-temp/part-logo-1.png | Bin 0 -> 9908 bytes .../img/_del-temp/part-logo-2.png | Bin 0 -> 2869 bytes .../img/_del-temp/part-logo-3.png | Bin 0 -> 6187 bytes .../static_client/img/_del-temp/pg-1.jpg | Bin 0 -> 129573 bytes .../static_client/img/_del-temp/pg-2.jpg | Bin 0 -> 28300 bytes .../static_client/img/_del-temp/pg-3.jpg | Bin 0 -> 25693 bytes .../static_client/img/_del-temp/pg-4.jpg | Bin 0 -> 26019 bytes .../static_client/img/_del-temp/phr-1.jpg | Bin 0 -> 12106 bytes .../static_client/img/_del-temp/phr-2.jpg | Bin 0 -> 17939 bytes .../static_client/img/_del-temp/phr-3.jpg | Bin 0 -> 18256 bytes .../static_client/img/_del-temp/phr-4.jpg | Bin 0 -> 20635 bytes .../static_client/img/_del-temp/pl-logo-1.png | Bin 0 -> 2199 bytes .../static_client/img/_del-temp/pl-logo-2.png | Bin 0 -> 3655 bytes .../img/_del-temp/place-photo-1.jpg | Bin 0 -> 80152 bytes .../static_client/img/_del-temp/plan.jpg | Bin 0 -> 93627 bytes .../static_client/img/_del-temp/pt-logo-1.png | Bin 0 -> 3563 bytes .../static_client/img/_del-temp/pt-logo-2.png | Bin 0 -> 3389 bytes .../static_client/img/_del-temp/pt-logo-3.png | Bin 0 -> 2835 bytes .../static_client/img/_del-temp/pt-logo-4.png | Bin 0 -> 3617 bytes .../static_client/img/_del-temp/pt-logo-5.png | Bin 0 -> 2153 bytes .../static_client/img/_del-temp/pt-logo-6.png | Bin 0 -> 2793 bytes .../img/_del-temp/request-catalog.png | Bin 0 -> 8232 bytes .../img/_del-temp/request-participation.png | Bin 0 -> 1378 bytes .../img/_del-temp/request-remotely.png | Bin 0 -> 3857 bytes .../img/_del-temp/request-tickets.png | Bin 0 -> 5484 bytes .../img/_del-temp/request-tour.png | Bin 0 -> 1897 bytes .../img/_del-temp/request-translator.png | Bin 0 -> 6008 bytes .../static_client/img/_del-temp/review-1.jpg | Bin 0 -> 10232 bytes .../static_client/img/_del-temp/review-2.jpg | Bin 0 -> 8735 bytes .../static_client/img/_del-temp/s-map.jpg | Bin 0 -> 14876 bytes .../static_client/img/_del-temp/usr-1.jpg | Bin 0 -> 4403 bytes .../static_client/img/_del-temp/usr-2.jpg | Bin 0 -> 3868 bytes .../static_client/img/_del-temp/video.jpg | Bin 0 -> 101335 bytes .../static_client/img/_del-temp/vk-widget.jpg | Bin 0 -> 16453 bytes .../static_client/img/_del-temp/yad.jpg | Bin 0 -> 28560 bytes .../client/static_client/img/about_pic.png | Bin 0 -> 69188 bytes .../static_client/img/ad-themes/Thumbs.db | Bin 0 -> 9728 bytes .../static_client/img/ad-themes/adt-1.png | Bin 0 -> 2669 bytes .../static_client/img/ad-themes/adt-2.png | Bin 0 -> 2105 bytes .../static_client/img/ad-themes/adt-3.png | Bin 0 -> 2082 bytes .../static_client/img/add_link_text.png | Bin 0 -> 964 bytes .../static_client/img/add_pic_block_bg.png | Bin 0 -> 964 bytes .../static_client/img/add_pic_block_bg1.png | Bin 0 -> 966 bytes .../static_client/img/add_pic_block_bg2.png | Bin 0 -> 987 bytes templates/client/static_client/img/ag-bg.png | Bin 0 -> 126 bytes .../client/static_client/img/ajax-loader.gif | Bin 0 -> 1924 bytes .../static_client/img/approved-logo.png | Bin 0 -> 3121 bytes .../client/static_client/img/blog_pic.jpg | Bin 0 -> 7487 bytes .../client/static_client/img/blog_pic1.jpg | Bin 0 -> 37597 bytes .../client/static_client/img/blog_pic2.jpg | Bin 0 -> 14348 bytes templates/client/static_client/img/clock.png | Bin 0 -> 556 bytes .../static_client/img/fancybox/Thumbs.db | Bin 0 -> 3584 bytes .../static_client/img/fancybox/blank.gif | Bin 0 -> 43 bytes .../img/fancybox/fancybox_loading.gif | Bin 0 -> 6567 bytes .../img/fancybox/fancybox_loading@2x.gif | Bin 0 -> 13984 bytes .../img/fancybox/fancybox_overlay.png | Bin 0 -> 1003 bytes .../img/fancybox/fancybox_sprite.png | Bin 0 -> 1362 bytes .../img/fancybox/fancybox_sprite@2x.png | Bin 0 -> 6553 bytes .../client/static_client/img/favicon.ico | Bin 0 -> 1815 bytes templates/client/static_client/img/female.png | Bin 0 -> 722 bytes .../client/static_client/img/libk_bg.png | Bin 0 -> 955 bytes templates/client/static_client/img/logo.png | Bin 0 -> 7452 bytes .../client/static_client/img/mail-logo-2.jpg | Bin 0 -> 2412 bytes templates/client/static_client/img/male.png | Bin 0 -> 672 bytes templates/client/static_client/img/map.png | Bin 0 -> 56919 bytes .../client/static_client/img/no-logo.jpg | Bin 0 -> 725 bytes .../client/static_client/img/no-logo.png | Bin 0 -> 2753 bytes .../static_client/img/partners/Thumbs.db | Bin 0 -> 8192 bytes .../img/partners/deutsche-messe.png | Bin 0 -> 5973 bytes .../static_client/img/partners/expocentr.png | Bin 0 -> 5295 bytes .../static_client/img/partners/expoforum.png | Bin 0 -> 4673 bytes .../client/static_client/img/partners/ite.png | Bin 0 -> 4062 bytes .../img/partners/messe-frankfurt.png | Bin 0 -> 3749 bytes templates/client/static_client/img/pic1.jpg | Bin 0 -> 5176 bytes templates/client/static_client/img/pic10.jpg | Bin 0 -> 47277 bytes templates/client/static_client/img/pic11.jpg | Bin 0 -> 17407 bytes templates/client/static_client/img/pic12.png | Bin 0 -> 17391 bytes templates/client/static_client/img/pic13.jpg | Bin 0 -> 5405 bytes templates/client/static_client/img/pic14.jpg | Bin 0 -> 2599 bytes templates/client/static_client/img/pic15.jpg | Bin 0 -> 2496 bytes templates/client/static_client/img/pic16.jpg | Bin 0 -> 2667 bytes templates/client/static_client/img/pic2.jpg | Bin 0 -> 5197 bytes templates/client/static_client/img/pic3.jpg | Bin 0 -> 4657 bytes templates/client/static_client/img/pic4.jpg | Bin 0 -> 4959 bytes templates/client/static_client/img/pic5.jpg | Bin 0 -> 5251 bytes templates/client/static_client/img/pic6.jpg | Bin 0 -> 5209 bytes templates/client/static_client/img/pic7.jpg | Bin 0 -> 21639 bytes templates/client/static_client/img/pic8.jpg | Bin 0 -> 150517 bytes templates/client/static_client/img/pic8.png | Bin 0 -> 2435 bytes templates/client/static_client/img/pic9.jpg | Bin 0 -> 8502 bytes templates/client/static_client/img/pin.png | Bin 0 -> 447 bytes .../client/static_client/img/search-bg.jpg | Bin 0 -> 8920 bytes templates/client/static_client/img/select.png | Bin 0 -> 255 bytes .../static_client/img/semitransparent-ie8.png | Bin 0 -> 121 bytes .../client/static_client/img/signature.png | Bin 0 -> 3330 bytes .../static_client/img/soc-medias/Thumbs.db | Bin 0 -> 14848 bytes .../static_client/img/soc-medias/icon-fb.png | Bin 0 -> 430 bytes .../img/soc-medias/icon-fb_hover.png | Bin 0 -> 1101 bytes .../img/soc-medias/icon-goog.png | Bin 0 -> 609 bytes .../static_client/img/soc-medias/icon-lin.png | Bin 0 -> 500 bytes .../img/soc-medias/icon-lin_hover.png | Bin 0 -> 1123 bytes .../img/soc-medias/icon-mailr.png | Bin 0 -> 708 bytes .../static_client/img/soc-medias/icon-ok.png | Bin 0 -> 616 bytes .../img/soc-medias/icon-twit.png | Bin 0 -> 556 bytes .../static_client/img/soc-medias/icon-vk.png | Bin 0 -> 473 bytes .../img/soc-medias/icon-yand.png | Bin 0 -> 600 bytes .../img/soc-medias/sm-icon-fb-w.png | Bin 0 -> 264 bytes .../img/soc-medias/sm-icon-fb.png | Bin 0 -> 412 bytes .../img/soc-medias/sm-icon-fb_hover.png | Bin 0 -> 1101 bytes .../img/soc-medias/sm-icon-lin-w.png | Bin 0 -> 294 bytes .../img/soc-medias/sm-icon-lin.png | Bin 0 -> 439 bytes .../img/soc-medias/sm-icon-lin_hover.png | Bin 0 -> 1123 bytes .../img/soc-medias/sm-icon-rss.png | Bin 0 -> 556 bytes .../img/soc-medias/sm-icon-twit-w.png | Bin 0 -> 302 bytes .../img/soc-medias/sm-icon-twit.png | Bin 0 -> 549 bytes .../img/soc-medias/sm-icon-twit_hover.png | Bin 0 -> 1160 bytes .../img/soc-medias/sm-icon-vk-w.png | Bin 0 -> 336 bytes .../img/soc-medias/sm-icon-vk.png | Bin 0 -> 669 bytes .../img/soc-medias/sm-icon-vk_hover.png | Bin 0 -> 1186 bytes templates/client/static_client/img/soc.png | Bin 0 -> 11844 bytes templates/client/static_client/img/space.png | Bin 0 -> 1104 bytes templates/client/static_client/img/spacer.gif | Bin 0 -> 1094 bytes .../client/static_client/img/sprites.png | Bin 0 -> 56102 bytes .../static_client/img/subjects_list.png | Bin 0 -> 955 bytes .../client/static_client/img/themes/Thumbs.db | Bin 0 -> 7680 bytes .../static_client/img/themes/expo-1.png | Bin 0 -> 2669 bytes .../static_client/img/themes/expo-2.png | Bin 0 -> 2105 bytes .../static_client/img/themes/expo-3.png | Bin 0 -> 2082 bytes templates/client/static_client/img/wait.gif | Bin 0 -> 2461 bytes templates/client/static_client/img/wether.png | Bin 0 -> 11154 bytes templates/client/static_client/img/x2.png | Bin 0 -> 3864 bytes .../client/static_client/js/existing-tags.js | 40 + templates/client/static_client/js/gmap.js | 24 + .../js/idangerous.swiper-2.4.min.js | 90 + .../js/jquery-ui-1.10.3.custom.min.js | 7 + .../js/jquery-ui-1.10.4.custom.min.js | 7 + .../static_client/js/jquery.fancybox.pack.js | 46 + .../js/jquery.mCustomScrollbar.min.js | 1 + .../static_client/js/jquery.mousewheel.min.js | 12 + .../static_client/js/jquery.phototag.js | 631 + .../static_client/js/jquery.placeholder.js | 183 + .../js/jquery.ui.datepicker-ru.js | 23 + templates/client/static_client/js/main.js | 2053 +++ .../client/static_client/js/pages/company.js | 488 + .../js/pages/complete_registration.js | 47 + .../client/static_client/js/pages/profile.js | 424 + .../static_client/js/pages/profile_company.js | 124 + templates/client/static_client/js/plugins.js | 24 + .../inputmask/jquery.bind-first-0.2.3.min.js | 10 + .../inputmask/jquery.inputmask-multi.js | 382 + .../js/plugins/inputmask/jquery.inputmask.js | 1123 ++ .../js/plugins/inputmask/phone-codes.json | 294 + .../js/plugins/inputmask/phones-ru.json | 2403 +++ .../js/plugins/inputmask/phones-us.json | 322 + .../static_client/js/plugins/select2.min.js | 23 + .../js/plugins/select2_locale_ru.js | 23 + templates/client/static_client/js/regions.js | 115 + templates/client/static_client/js/scripts.js | 154 + .../static_client/js/selectivizr-min.js | 5 + .../client/static_client/js/sendfilter.js | 16 + .../js/vendor/jquery-1.10.1.min.js | 6 + .../js/vendor/jquery-1.10.1.min.map | 1 + .../modernizr-2.6.2-respond-1.1.0.min.js | 11 + theme/models.py | 15 + 508 files changed, 28311 insertions(+), 479 deletions(-) create mode 100644 exposition/manager.py create mode 100644 functions/admin_forms.py create mode 100644 functions/admin_views.py create mode 100644 photologue/management/commands/photologue_exposize.py create mode 100644 place_exposition/management/commands/convert_photo.py create mode 120000 static/client rename static/{client => client.old}/css/idangerous.swiper.css (100%) rename static/{client => client.old}/css/idangerous.swiper.scrollbar.css (100%) rename static/{client => client.old}/css/jquery-ui-1.10.3.custom.css (100%) rename static/{client => client.old}/css/jquery.fancybox.css (100%) rename static/{client => client.old}/css/jquery.mCustomScrollbar.css (100%) rename static/{client => client.old}/css/main.css (100%) rename static/{client => client.old}/css/normalize.css (100%) rename static/{client => client.old}/css/normalize.min.css (100%) rename static/{client => client.old}/css/pages/exposition_by.css (100%) rename static/{client => client.old}/css/phototag.css (100%) rename static/{client => client.old}/css/regions.css (100%) rename static/{client => client.old}/css/select2.css (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-bold-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-bold-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-bold-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-bold-webfont.woff (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-italic-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-italic-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-italic-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-italic-webfont.woff (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-light-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-light-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-light-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-light-webfont.woff (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-med-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-med-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-med-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-med-webfont.woff (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-reg-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-reg-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-reg-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-reg-webfont.woff (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-thin-webfont.eot (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-thin-webfont.svg (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-thin-webfont.ttf (100%) rename static/{client => client.old}/fonts/pfdindisplaypro-thin-webfont.woff (100%) rename static/{client => client.old}/fonts/pts55f-webfont.eot (100%) rename static/{client => client.old}/fonts/pts55f-webfont.ttf (100%) rename static/{client => client.old}/fonts/pts55f-webfont.woff (100%) rename static/{client => client.old}/fonts/pts75f-webfont.eot (100%) rename static/{client => client.old}/fonts/pts75f-webfont.ttf (100%) rename static/{client => client.old}/fonts/pts75f-webfont.woff (100%) rename static/{client => client.old}/img/1.png (100%) rename static/{client => client.old}/img/2.png (100%) rename static/{client => client.old}/img/Thumbs.db (100%) rename static/{client => client.old}/img/_del-temp/Thumbs.db (100%) rename static/{client => client.old}/img/_del-temp/banner-2.gif (100%) rename static/{client => client.old}/img/_del-temp/banner.gif (100%) rename static/{client => client.old}/img/_del-temp/bnrs-2.jpg (100%) rename static/{client => client.old}/img/_del-temp/bnrs.jpg (100%) rename static/{client => client.old}/img/_del-temp/cl-logo-1.png (100%) rename static/{client => client.old}/img/_del-temp/cl-logo-2.png (100%) rename static/{client => client.old}/img/_del-temp/cl-logo-3.png (100%) rename static/{client => client.old}/img/_del-temp/counter-1.gif (100%) rename static/{client => client.old}/img/_del-temp/counter-2.gif (100%) rename static/{client => client.old}/img/_del-temp/counter-3.gif (100%) rename static/{client => client.old}/img/_del-temp/editor.png (100%) rename static/{client => client.old}/img/_del-temp/event-photo-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/expo-bn-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/expo-bn-2-s.jpg (100%) rename static/{client => client.old}/img/_del-temp/glr-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/hotel-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/mail-banner.jpg (100%) rename static/{client => client.old}/img/_del-temp/mp-phg-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/mp-phg-1.png (100%) rename static/{client => client.old}/img/_del-temp/news-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/news-s-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/part-logo-1.png (100%) rename static/{client => client.old}/img/_del-temp/part-logo-2.png (100%) rename static/{client => client.old}/img/_del-temp/part-logo-3.png (100%) rename static/{client => client.old}/img/_del-temp/pg-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/pg-2.jpg (100%) rename static/{client => client.old}/img/_del-temp/pg-3.jpg (100%) rename static/{client => client.old}/img/_del-temp/pg-4.jpg (100%) rename static/{client => client.old}/img/_del-temp/phr-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/phr-2.jpg (100%) rename static/{client => client.old}/img/_del-temp/phr-3.jpg (100%) rename static/{client => client.old}/img/_del-temp/phr-4.jpg (100%) rename static/{client => client.old}/img/_del-temp/pl-logo-1.png (100%) rename static/{client => client.old}/img/_del-temp/pl-logo-2.png (100%) rename static/{client => client.old}/img/_del-temp/place-photo-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/plan.jpg (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-1.png (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-2.png (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-3.png (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-4.png (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-5.png (100%) rename static/{client => client.old}/img/_del-temp/pt-logo-6.png (100%) rename static/{client => client.old}/img/_del-temp/request-catalog.png (100%) rename static/{client => client.old}/img/_del-temp/request-participation.png (100%) rename static/{client => client.old}/img/_del-temp/request-remotely.png (100%) rename static/{client => client.old}/img/_del-temp/request-tickets.png (100%) rename static/{client => client.old}/img/_del-temp/request-tour.png (100%) rename static/{client => client.old}/img/_del-temp/request-translator.png (100%) rename static/{client => client.old}/img/_del-temp/review-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/review-2.jpg (100%) rename static/{client => client.old}/img/_del-temp/s-map.jpg (100%) rename static/{client => client.old}/img/_del-temp/usr-1.jpg (100%) rename static/{client => client.old}/img/_del-temp/usr-2.jpg (100%) rename static/{client => client.old}/img/_del-temp/video.jpg (100%) rename static/{client => client.old}/img/_del-temp/vk-widget.jpg (100%) rename static/{client => client.old}/img/_del-temp/yad.jpg (100%) rename static/{client => client.old}/img/about_pic.png (100%) rename static/{client => client.old}/img/ad-themes/Thumbs.db (100%) rename static/{client => client.old}/img/ad-themes/adt-1.png (100%) rename static/{client => client.old}/img/ad-themes/adt-2.png (100%) rename static/{client => client.old}/img/ad-themes/adt-3.png (100%) rename static/{client => client.old}/img/add_link_text.png (100%) rename static/{client => client.old}/img/add_pic_block_bg.png (100%) rename static/{client => client.old}/img/add_pic_block_bg1.png (100%) rename static/{client => client.old}/img/add_pic_block_bg2.png (100%) rename static/{client => client.old}/img/ag-bg.png (100%) rename static/{client => client.old}/img/approved-logo.png (100%) rename static/{client => client.old}/img/blog_pic.jpg (100%) rename static/{client => client.old}/img/blog_pic1.jpg (100%) rename static/{client => client.old}/img/blog_pic2.jpg (100%) rename static/{client => client.old}/img/clock.png (100%) rename static/{client => client.old}/img/fancybox/Thumbs.db (100%) rename static/{client => client.old}/img/fancybox/blank.gif (100%) rename static/{client => client.old}/img/fancybox/fancybox_loading.gif (100%) rename static/{client => client.old}/img/fancybox/fancybox_loading@2x.gif (100%) rename static/{client => client.old}/img/fancybox/fancybox_overlay.png (100%) rename static/{client => client.old}/img/fancybox/fancybox_sprite.png (100%) rename static/{client => client.old}/img/fancybox/fancybox_sprite@2x.png (100%) rename static/{client => client.old}/img/favicon.ico (100%) rename static/{client => client.old}/img/female.png (100%) rename static/{client => client.old}/img/libk_bg.png (100%) rename static/{client => client.old}/img/logo.png (100%) rename static/{client => client.old}/img/mail-logo-2.jpg (100%) rename static/{client => client.old}/img/male.png (100%) rename static/{client => client.old}/img/map.png (100%) rename static/{client => client.old}/img/no-logo.jpg (100%) rename static/{client => client.old}/img/no-logo.png (100%) rename static/{client => client.old}/img/partners/Thumbs.db (100%) rename static/{client => client.old}/img/partners/deutsche-messe.png (100%) rename static/{client => client.old}/img/partners/expocentr.png (100%) rename static/{client => client.old}/img/partners/expoforum.png (100%) rename static/{client => client.old}/img/partners/ite.png (100%) rename static/{client => client.old}/img/partners/messe-frankfurt.png (100%) rename static/{client => client.old}/img/pic1.jpg (100%) rename static/{client => client.old}/img/pic10.jpg (100%) rename static/{client => client.old}/img/pic11.jpg (100%) rename static/{client => client.old}/img/pic12.png (100%) rename static/{client => client.old}/img/pic13.jpg (100%) rename static/{client => client.old}/img/pic14.jpg (100%) rename static/{client => client.old}/img/pic15.jpg (100%) rename static/{client => client.old}/img/pic16.jpg (100%) rename static/{client => client.old}/img/pic2.jpg (100%) rename static/{client => client.old}/img/pic3.jpg (100%) rename static/{client => client.old}/img/pic4.jpg (100%) rename static/{client => client.old}/img/pic5.jpg (100%) rename static/{client => client.old}/img/pic6.jpg (100%) rename static/{client => client.old}/img/pic7.jpg (100%) rename static/{client => client.old}/img/pic8.jpg (100%) rename static/{client => client.old}/img/pic8.png (100%) rename static/{client => client.old}/img/pic9.jpg (100%) rename static/{client => client.old}/img/pin.png (100%) rename static/{client => client.old}/img/search-bg.jpg (100%) rename static/{client => client.old}/img/select.png (100%) rename static/{client => client.old}/img/semitransparent-ie8.png (100%) rename static/{client => client.old}/img/signature.png (100%) rename static/{client => client.old}/img/soc-medias/Thumbs.db (100%) rename static/{client => client.old}/img/soc-medias/icon-fb.png (100%) rename static/{client => client.old}/img/soc-medias/icon-fb_hover.png (100%) rename static/{client => client.old}/img/soc-medias/icon-goog.png (100%) rename static/{client => client.old}/img/soc-medias/icon-lin.png (100%) rename static/{client => client.old}/img/soc-medias/icon-lin_hover.png (100%) rename static/{client => client.old}/img/soc-medias/icon-mailr.png (100%) rename static/{client => client.old}/img/soc-medias/icon-ok.png (100%) rename static/{client => client.old}/img/soc-medias/icon-twit.png (100%) rename static/{client => client.old}/img/soc-medias/icon-vk.png (100%) rename static/{client => client.old}/img/soc-medias/icon-yand.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-fb-w.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-fb.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-lin-w.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-lin.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-rss.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-twit-w.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-twit.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-twit_hover.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-vk-w.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-vk.png (100%) rename static/{client => client.old}/img/soc-medias/sm-icon-vk_hover.png (100%) rename static/{client => client.old}/img/soc.png (100%) rename static/{client => client.old}/img/space.png (100%) rename static/{client => client.old}/img/spacer.gif (100%) rename static/{client => client.old}/img/sprites.png (100%) rename static/{client => client.old}/img/subjects_list.png (100%) rename static/{client => client.old}/img/themes/Thumbs.db (100%) rename static/{client => client.old}/img/themes/expo-1.png (100%) rename static/{client => client.old}/img/themes/expo-2.png (100%) rename static/{client => client.old}/img/themes/expo-3.png (100%) rename static/{client => client.old}/img/wait.gif (100%) rename static/{client => client.old}/img/wether.png (100%) rename static/{client => client.old}/img/x2.png (100%) rename static/{client => client.old}/js/existing-tags.js (100%) rename static/{client => client.old}/js/gmap.js (100%) rename static/{client => client.old}/js/idangerous.swiper-2.4.min.js (100%) rename static/{client => client.old}/js/jquery-ui-1.10.3.custom.min.js (100%) rename static/{client => client.old}/js/jquery-ui-1.10.4.custom.min.js (100%) rename static/{client => client.old}/js/jquery.fancybox.pack.js (100%) rename static/{client => client.old}/js/jquery.mCustomScrollbar.min.js (100%) rename static/{client => client.old}/js/jquery.mousewheel.min.js (100%) rename static/{client => client.old}/js/jquery.phototag.js (100%) rename static/{client => client.old}/js/jquery.placeholder.js (100%) rename static/{client => client.old}/js/jquery.ui.datepicker-ru.js (100%) rename static/{client => client.old}/js/main.js (100%) rename static/{client => client.old}/js/pages/complete_registration.js (100%) rename static/{client => client.old}/js/pages/profile.js (100%) rename static/{client => client.old}/js/pages/profile_company.js (100%) rename static/{client => client.old}/js/plugins.js (100%) rename static/{client => client.old}/js/plugins/select2.min.js (100%) rename static/{client => client.old}/js/plugins/select2_locale_ru.js (100%) rename static/{client => client.old}/js/regions.js (100%) rename static/{client => client.old}/js/scripts.js (100%) rename static/{client => client.old}/js/selectivizr-min.js (100%) rename static/{client => client.old}/js/sendfilter.js (100%) rename static/{client => client.old}/js/vendor/jquery-1.10.1.min.js (100%) rename static/{client => client.old}/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js (100%) create mode 100644 templates/admin/includes/admin_pagination.html create mode 100644 templates/admin/place_exposition/place_exposition.html create mode 100644 templates/client/includes/paginator.html create mode 100644 templates/client/static_client/css/idangerous.swiper.css create mode 100644 templates/client/static_client/css/idangerous.swiper.scrollbar.css create mode 100644 templates/client/static_client/css/jquery-ui-1.10.3.custom.css create mode 100644 templates/client/static_client/css/jquery.fancybox.css create mode 100644 templates/client/static_client/css/jquery.mCustomScrollbar.css create mode 100644 templates/client/static_client/css/main.css create mode 100644 templates/client/static_client/css/normalize.css create mode 100644 templates/client/static_client/css/normalize.min.css create mode 100644 templates/client/static_client/css/pages/exposition_by.css create mode 100644 templates/client/static_client/css/phototag.css create mode 100644 templates/client/static_client/css/regions.css create mode 100644 templates/client/static_client/css/select2.css create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-bold-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-bold-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-bold-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-bold-webfont.woff create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-italic-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-italic-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-italic-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-italic-webfont.woff create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-light-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-light-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-light-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-light-webfont.woff create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-med-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-med-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-med-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-med-webfont.woff create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-reg-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-reg-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-reg-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-reg-webfont.woff create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-thin-webfont.eot create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-thin-webfont.svg create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-thin-webfont.ttf create mode 100644 templates/client/static_client/fonts/pfdindisplaypro-thin-webfont.woff create mode 100644 templates/client/static_client/fonts/pts55f-webfont.eot create mode 100644 templates/client/static_client/fonts/pts55f-webfont.ttf create mode 100644 templates/client/static_client/fonts/pts55f-webfont.woff create mode 100644 templates/client/static_client/fonts/pts75f-webfont.eot create mode 100644 templates/client/static_client/fonts/pts75f-webfont.ttf create mode 100644 templates/client/static_client/fonts/pts75f-webfont.woff create mode 100644 templates/client/static_client/img/1.png create mode 100644 templates/client/static_client/img/2.png create mode 100644 templates/client/static_client/img/Thumbs.db create mode 100644 templates/client/static_client/img/_del-temp/Thumbs.db create mode 100644 templates/client/static_client/img/_del-temp/banner-2.gif create mode 100644 templates/client/static_client/img/_del-temp/banner.gif create mode 100644 templates/client/static_client/img/_del-temp/bnrs-2.jpg create mode 100644 templates/client/static_client/img/_del-temp/bnrs.jpg create mode 100644 templates/client/static_client/img/_del-temp/cl-logo-1.png create mode 100644 templates/client/static_client/img/_del-temp/cl-logo-2.png create mode 100644 templates/client/static_client/img/_del-temp/cl-logo-3.png create mode 100644 templates/client/static_client/img/_del-temp/counter-1.gif create mode 100644 templates/client/static_client/img/_del-temp/counter-2.gif create mode 100644 templates/client/static_client/img/_del-temp/counter-3.gif create mode 100644 templates/client/static_client/img/_del-temp/editor.png create mode 100644 templates/client/static_client/img/_del-temp/event-photo-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/expo-bn-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/expo-bn-2-s.jpg create mode 100644 templates/client/static_client/img/_del-temp/glr-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/hotel-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/mail-banner.jpg create mode 100644 templates/client/static_client/img/_del-temp/mp-phg-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/mp-phg-1.png create mode 100644 templates/client/static_client/img/_del-temp/news-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/news-s-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/part-logo-1.png create mode 100644 templates/client/static_client/img/_del-temp/part-logo-2.png create mode 100644 templates/client/static_client/img/_del-temp/part-logo-3.png create mode 100644 templates/client/static_client/img/_del-temp/pg-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/pg-2.jpg create mode 100644 templates/client/static_client/img/_del-temp/pg-3.jpg create mode 100644 templates/client/static_client/img/_del-temp/pg-4.jpg create mode 100644 templates/client/static_client/img/_del-temp/phr-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/phr-2.jpg create mode 100644 templates/client/static_client/img/_del-temp/phr-3.jpg create mode 100644 templates/client/static_client/img/_del-temp/phr-4.jpg create mode 100644 templates/client/static_client/img/_del-temp/pl-logo-1.png create mode 100644 templates/client/static_client/img/_del-temp/pl-logo-2.png create mode 100644 templates/client/static_client/img/_del-temp/place-photo-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/plan.jpg create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-1.png create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-2.png create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-3.png create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-4.png create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-5.png create mode 100644 templates/client/static_client/img/_del-temp/pt-logo-6.png create mode 100644 templates/client/static_client/img/_del-temp/request-catalog.png create mode 100644 templates/client/static_client/img/_del-temp/request-participation.png create mode 100644 templates/client/static_client/img/_del-temp/request-remotely.png create mode 100644 templates/client/static_client/img/_del-temp/request-tickets.png create mode 100644 templates/client/static_client/img/_del-temp/request-tour.png create mode 100644 templates/client/static_client/img/_del-temp/request-translator.png create mode 100644 templates/client/static_client/img/_del-temp/review-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/review-2.jpg create mode 100644 templates/client/static_client/img/_del-temp/s-map.jpg create mode 100644 templates/client/static_client/img/_del-temp/usr-1.jpg create mode 100644 templates/client/static_client/img/_del-temp/usr-2.jpg create mode 100644 templates/client/static_client/img/_del-temp/video.jpg create mode 100644 templates/client/static_client/img/_del-temp/vk-widget.jpg create mode 100644 templates/client/static_client/img/_del-temp/yad.jpg create mode 100644 templates/client/static_client/img/about_pic.png create mode 100644 templates/client/static_client/img/ad-themes/Thumbs.db create mode 100644 templates/client/static_client/img/ad-themes/adt-1.png create mode 100644 templates/client/static_client/img/ad-themes/adt-2.png create mode 100644 templates/client/static_client/img/ad-themes/adt-3.png create mode 100644 templates/client/static_client/img/add_link_text.png create mode 100644 templates/client/static_client/img/add_pic_block_bg.png create mode 100644 templates/client/static_client/img/add_pic_block_bg1.png create mode 100644 templates/client/static_client/img/add_pic_block_bg2.png create mode 100644 templates/client/static_client/img/ag-bg.png create mode 100644 templates/client/static_client/img/ajax-loader.gif create mode 100644 templates/client/static_client/img/approved-logo.png create mode 100644 templates/client/static_client/img/blog_pic.jpg create mode 100644 templates/client/static_client/img/blog_pic1.jpg create mode 100644 templates/client/static_client/img/blog_pic2.jpg create mode 100644 templates/client/static_client/img/clock.png create mode 100644 templates/client/static_client/img/fancybox/Thumbs.db create mode 100644 templates/client/static_client/img/fancybox/blank.gif create mode 100644 templates/client/static_client/img/fancybox/fancybox_loading.gif create mode 100644 templates/client/static_client/img/fancybox/fancybox_loading@2x.gif create mode 100644 templates/client/static_client/img/fancybox/fancybox_overlay.png create mode 100644 templates/client/static_client/img/fancybox/fancybox_sprite.png create mode 100644 templates/client/static_client/img/fancybox/fancybox_sprite@2x.png create mode 100644 templates/client/static_client/img/favicon.ico create mode 100644 templates/client/static_client/img/female.png create mode 100644 templates/client/static_client/img/libk_bg.png create mode 100644 templates/client/static_client/img/logo.png create mode 100644 templates/client/static_client/img/mail-logo-2.jpg create mode 100644 templates/client/static_client/img/male.png create mode 100644 templates/client/static_client/img/map.png create mode 100644 templates/client/static_client/img/no-logo.jpg create mode 100644 templates/client/static_client/img/no-logo.png create mode 100644 templates/client/static_client/img/partners/Thumbs.db create mode 100644 templates/client/static_client/img/partners/deutsche-messe.png create mode 100644 templates/client/static_client/img/partners/expocentr.png create mode 100644 templates/client/static_client/img/partners/expoforum.png create mode 100644 templates/client/static_client/img/partners/ite.png create mode 100644 templates/client/static_client/img/partners/messe-frankfurt.png create mode 100644 templates/client/static_client/img/pic1.jpg create mode 100644 templates/client/static_client/img/pic10.jpg create mode 100644 templates/client/static_client/img/pic11.jpg create mode 100644 templates/client/static_client/img/pic12.png create mode 100644 templates/client/static_client/img/pic13.jpg create mode 100644 templates/client/static_client/img/pic14.jpg create mode 100644 templates/client/static_client/img/pic15.jpg create mode 100644 templates/client/static_client/img/pic16.jpg create mode 100644 templates/client/static_client/img/pic2.jpg create mode 100644 templates/client/static_client/img/pic3.jpg create mode 100644 templates/client/static_client/img/pic4.jpg create mode 100644 templates/client/static_client/img/pic5.jpg create mode 100644 templates/client/static_client/img/pic6.jpg create mode 100644 templates/client/static_client/img/pic7.jpg create mode 100644 templates/client/static_client/img/pic8.jpg create mode 100644 templates/client/static_client/img/pic8.png create mode 100644 templates/client/static_client/img/pic9.jpg create mode 100644 templates/client/static_client/img/pin.png create mode 100644 templates/client/static_client/img/search-bg.jpg create mode 100644 templates/client/static_client/img/select.png create mode 100644 templates/client/static_client/img/semitransparent-ie8.png create mode 100644 templates/client/static_client/img/signature.png create mode 100644 templates/client/static_client/img/soc-medias/Thumbs.db create mode 100644 templates/client/static_client/img/soc-medias/icon-fb.png create mode 100644 templates/client/static_client/img/soc-medias/icon-fb_hover.png create mode 100644 templates/client/static_client/img/soc-medias/icon-goog.png create mode 100644 templates/client/static_client/img/soc-medias/icon-lin.png create mode 100644 templates/client/static_client/img/soc-medias/icon-lin_hover.png create mode 100644 templates/client/static_client/img/soc-medias/icon-mailr.png create mode 100644 templates/client/static_client/img/soc-medias/icon-ok.png create mode 100644 templates/client/static_client/img/soc-medias/icon-twit.png create mode 100644 templates/client/static_client/img/soc-medias/icon-vk.png create mode 100644 templates/client/static_client/img/soc-medias/icon-yand.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-fb-w.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-fb.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-fb_hover.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-lin-w.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-lin.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-lin_hover.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-rss.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-twit-w.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-twit.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-twit_hover.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-vk-w.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-vk.png create mode 100644 templates/client/static_client/img/soc-medias/sm-icon-vk_hover.png create mode 100644 templates/client/static_client/img/soc.png create mode 100644 templates/client/static_client/img/space.png create mode 100644 templates/client/static_client/img/spacer.gif create mode 100644 templates/client/static_client/img/sprites.png create mode 100644 templates/client/static_client/img/subjects_list.png create mode 100644 templates/client/static_client/img/themes/Thumbs.db create mode 100644 templates/client/static_client/img/themes/expo-1.png create mode 100644 templates/client/static_client/img/themes/expo-2.png create mode 100644 templates/client/static_client/img/themes/expo-3.png create mode 100644 templates/client/static_client/img/wait.gif create mode 100644 templates/client/static_client/img/wether.png create mode 100644 templates/client/static_client/img/x2.png create mode 100644 templates/client/static_client/js/existing-tags.js create mode 100644 templates/client/static_client/js/gmap.js create mode 100644 templates/client/static_client/js/idangerous.swiper-2.4.min.js create mode 100644 templates/client/static_client/js/jquery-ui-1.10.3.custom.min.js create mode 100644 templates/client/static_client/js/jquery-ui-1.10.4.custom.min.js create mode 100644 templates/client/static_client/js/jquery.fancybox.pack.js create mode 100644 templates/client/static_client/js/jquery.mCustomScrollbar.min.js create mode 100644 templates/client/static_client/js/jquery.mousewheel.min.js create mode 100644 templates/client/static_client/js/jquery.phototag.js create mode 100644 templates/client/static_client/js/jquery.placeholder.js create mode 100644 templates/client/static_client/js/jquery.ui.datepicker-ru.js create mode 100644 templates/client/static_client/js/main.js create mode 100644 templates/client/static_client/js/pages/company.js create mode 100644 templates/client/static_client/js/pages/complete_registration.js create mode 100644 templates/client/static_client/js/pages/profile.js create mode 100644 templates/client/static_client/js/pages/profile_company.js create mode 100644 templates/client/static_client/js/plugins.js create mode 100644 templates/client/static_client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js create mode 100644 templates/client/static_client/js/plugins/inputmask/jquery.inputmask-multi.js create mode 100644 templates/client/static_client/js/plugins/inputmask/jquery.inputmask.js create mode 100644 templates/client/static_client/js/plugins/inputmask/phone-codes.json create mode 100644 templates/client/static_client/js/plugins/inputmask/phones-ru.json create mode 100644 templates/client/static_client/js/plugins/inputmask/phones-us.json create mode 100644 templates/client/static_client/js/plugins/select2.min.js create mode 100644 templates/client/static_client/js/plugins/select2_locale_ru.js create mode 100644 templates/client/static_client/js/regions.js create mode 100644 templates/client/static_client/js/scripts.js create mode 100644 templates/client/static_client/js/selectivizr-min.js create mode 100644 templates/client/static_client/js/sendfilter.js create mode 100644 templates/client/static_client/js/vendor/jquery-1.10.1.min.js create mode 100644 templates/client/static_client/js/vendor/jquery-1.10.1.min.map create mode 100644 templates/client/static_client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js diff --git a/accounts/urls.py b/accounts/urls.py index e3ca64ce..396c93c2 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -4,6 +4,12 @@ from django.contrib.auth.decorators import login_required from views import SettingsView, ProfileView, CalendarView, UserView, UserExpositionsView, UserConferenceView, UserSeminarView from views import NameView, HomeView, AvatarView, WorkView, AboutCompanyView, PhoneView, EmailView, WebPageView,\ SocialView, AboutView, ProfileCompanyView +# + + +from django.http import HttpResponse +def test(request): + return HttpResponse('123') urlpatterns = patterns('', url(r'^profile/$', login_required(ProfileView.as_view())), diff --git a/accounts/views.py b/accounts/views.py index e642e660..f8d756bf 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -209,6 +209,7 @@ class ProfileInvalidView(FormView): """ def form_invalid(self, form): response = {'success': False} + response.update({'errors': form.errors}) return HttpResponse(json.dumps(response), content_type='application/json') diff --git a/article/admin_urls.py b/article/admin_urls.py index 3b083c2f..cbc9b1f6 100644 --- a/article/admin_urls.py +++ b/article/admin_urls.py @@ -4,11 +4,11 @@ from admin import BlogList, BlogView, NewsList, NewsView urlpatterns = patterns('article.admin', - url(r'^add/$', 'article_add'), - url(r'^delete/(?P.*)/$', 'article_delete'), - url(r'^change/(.*)/$', 'article_change'), - url(r'^copy/(.*)/$', 'article_copy'), - url(r'^all/$', 'article_all'), + #url(r'^add/$', 'article_add'), + #url(r'^delete/(?P.*)/$', 'article_delete'), + #url(r'^change/(.*)/$', 'article_change'), + #url(r'^copy/(.*)/$', 'article_copy'), + #url(r'^all/$', 'article_all'), url(r'^blog/all/$', BlogList.as_view()), url(r'^blog/$', BlogView.as_view()), url(r'^news/all/$', NewsList.as_view()), diff --git a/core/views.py b/core/views.py index 5558fda8..f0660fd3 100644 --- a/core/views.py +++ b/core/views.py @@ -145,7 +145,7 @@ class PlaceListView(ListView): return context class PlacePhotoView(PlaceListView): - paginate_by = 10 + paginate_by = 5 template_name = 'place/place_photo.html' obj = None @@ -189,7 +189,7 @@ class PlacePhotoView(PlaceListView): self.params = params self.obj = query[0] - return query[0].get_photos() + return query[0].photogallery.photos.all() self.params = params return list(pl_ex) + list(pl_conf) diff --git a/country/models.py b/country/models.py index 82812e63..2e3ade5f 100644 --- a/country/models.py +++ b/country/models.py @@ -18,6 +18,7 @@ from functions.custom_fields import EnumField from functions.db import db_table_exists from functions.signal_handlers import post_save_handler, pre_save_handler from django.utils.translation import get_language as lang +from django.utils import translation # check if table exist and create flags if true flags = [str(item.url) for item in Service.objects.all()] if db_table_exists('service_service') else [] @@ -36,14 +37,36 @@ class CountryManager(TranslationManager): except: return None +class AreaManager(TranslationManager): + def all_sorted(self): + """ + return list, not queryset + """ + model = self.model + result = list(model.objects.filter()) + result.sort(key=lambda x: len(x.expos()), reverse=True) + return result + + class Area(TranslatableModel): translations = TranslatedFields( name = models.CharField(max_length=255), ) + objects = AreaManager() def __unicode__(self): return self.lazy_translation_getter('name', unicode(self.pk)) + def countries(self): + return Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code='ru', area=self).distinct() + + def expos(self): + countries = self.countries() + return Exposition.objects.filter(country__in=countries) + + + class Country(TranslatableModel): """ diff --git a/exposition/manager.py b/exposition/manager.py new file mode 100644 index 00000000..288ff35d --- /dev/null +++ b/exposition/manager.py @@ -0,0 +1,20 @@ +from hvad.models import TranslationManager + + +class ClientManager(TranslationManager): + def get_query_set(self): + return super(ClientManager, self).get_query_set().filter(is_published=True) + + +""" + +from exposition.models import Exposition +from django.db import connection +from django.utils import translation +translation.activate('en') +len(connection.queries) +e = list(Exposition.enable.list()) + + + +""" diff --git a/exposition/models.py b/exposition/models.py index 620593c4..527f3f26 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -9,6 +9,7 @@ from bitfield import BitField from service.models import Service from functions.db import db_table_exists from organiser.models import Organiser +from manager import ClientManager # from functions.custom_fields import EnumField from functions.signal_handlers import post_save_handler, pre_save_handler @@ -39,17 +40,14 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): Uses hvad.TranslatableModel which is child of django.db.models class """ - #set manager of this model - objects = ExpoManager() + # main catalog = '/expo/' url = models.SlugField(unique=True) + #logo = fo data_begin = models.DateField(verbose_name='Дата начала') data_end = models.DateField(verbose_name='Дата окончания') - services = BitField(flags=flags) - quality_label = BitField(flags=['ufi', 'rsva', 'exporating']) - audience = BitField(flags=[k for k, v in BIT_AUDIENCE]) # relations country = models.ForeignKey('country.Country', verbose_name='Страна', on_delete=models.PROTECT, related_name='exposition_country') @@ -67,25 +65,58 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): blank=True, null=True, related_name='exposition_companies') users = models.ManyToManyField('accounts.User', verbose_name='Посетители выставки', blank=True, null=True, related_name='exposition_users') + #photogallery = models.ForeignKey('photologue.Gallery', blank=True, null=True) + + quality_label = BitField(flags=['ufi', 'rsva', 'exporating']) + visitors = models.PositiveIntegerField(verbose_name='Посетители', blank=True, null=True) + members = models.PositiveIntegerField(verbose_name='Участники', blank=True, null=True) + discount = models.PositiveIntegerField(verbose_name='Скидка', blank=True, null=True) + expohit = models.BooleanField(verbose_name='Expohit', default=0) + # administrator can cancel exposition + canceled_by_administrator = models.BooleanField(default=0) + #can publish not immediately + is_published = models.BooleanField(default=0) + canceled = models.BooleanField(default=0) + moved = models.BooleanField(default=0) + + # field saves information about creating and changing model + created = models.DateTimeField(auto_now_add=True) + modified = models.DateTimeField(auto_now=True) + main_page = models.PositiveIntegerField(default=0, db_index=True) + + views = models.PositiveIntegerField(default=0) + + translations = TranslatedFields( + name = models.CharField(verbose_name='Название', max_length=255), + main_title = models.TextField(verbose_name='Краткое описание', blank=True), + description = models.TextField(verbose_name='Описание', blank=True), + products = models.TextField(verbose_name='Экспонируемые продукты', blank=True), + discount_description = models.TextField(verbose_name='Описание скидки', blank=True), + time = models.TextField(verbose_name='Время работы', blank=True), + #-----meta data + title = models.CharField(max_length=250), + descriptions = models.CharField(max_length=250), + keywords = models.CharField(max_length=250), + ) + files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id') + + #about periodic = models.FloatField(verbose_name='Переодичность', blank=True, null=True) - #audience = EnumField(values=AUDIENCE, blank=True) + audience = BitField(flags=[k for k, v in BIT_AUDIENCE]) web_page = models.CharField(verbose_name='Вебсайт', max_length=255, blank=True) + foundation_year = models.PositiveIntegerField(verbose_name='Год основания', blank=True, null=True) + # conditions of Participation registration_link = models.URLField(verbose_name='Ссылка на регистрацию', max_length=255, blank=True) min_area = models.PositiveIntegerField(verbose_name='Минимальная площадь', blank=True, null=True) - # currency = EnumField(values=CURRENCY, default='USD') - application_deadline = models.DateField(verbose_name='Срок подачи заявки', null=True) min_stand_size = models.PositiveIntegerField(verbose_name='Минимальный размер стэнда', blank=True, null=True) - price_day = models.PositiveIntegerField(verbose_name='Стоимость билета 1 день', blank=True, null=True) price_all = models.PositiveIntegerField(verbose_name='Стоимость билета все дни', blank=True, null=True) price_day_bar = models.PositiveIntegerField(verbose_name='Стоимость на стойке 1 день', blank=True, null=True) price_all_bar = models.PositiveIntegerField(verbose_name='Стоимость на стойке все дни', blank=True, null=True) - price_catalog = models.PositiveIntegerField(verbose_name='Стоимость каталога', blank=True, null=True) - tax = models.BooleanField(verbose_name='Налог', default=1) min_closed_area = models.PositiveIntegerField(verbose_name='Минимальная цена закрытой НЕ оборудованной площади', blank=True, null=True) @@ -101,41 +132,12 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): blank=True, null=True) registration_payment = models.PositiveIntegerField(verbose_name='Регистрационный взнос', blank=True, null=True) - discount = models.PositiveIntegerField(verbose_name='Скидка', blank=True, null=True) - - expohit = models.BooleanField(verbose_name='Expohit', default=0) - - # administrator can cancel exposition - canceled_by_administrator = models.BooleanField(default=0) - #can publish not immediately - is_published = models.BooleanField(default=0) - canceled = models.BooleanField(default=0) - moved = models.BooleanField(default=0) - - files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id') # statistic - foundation_year = models.PositiveIntegerField(verbose_name='Год основания', blank=True, null=True) - visitors = models.PositiveIntegerField(verbose_name='Посетители', blank=True, null=True) - members = models.PositiveIntegerField(verbose_name='Участники', blank=True, null=True) - translations = TranslatedFields( - name = models.CharField(verbose_name='Название', max_length=255), - main_title = models.TextField(verbose_name='Краткое описание', blank=True), - description = models.TextField(verbose_name='Описание', blank=True), - products = models.TextField(verbose_name='Экспонируемые продукты', blank=True), - discount_description = models.TextField(verbose_name='Описание скидки', blank=True), - time = models.TextField(verbose_name='Время работы', blank=True), - #-----meta data - title = models.CharField(max_length=250), - descriptions = models.CharField(max_length=250), - keywords = models.CharField(max_length=250), - ) - # field saves information about creating and changing model - created = models.DateTimeField(auto_now_add=True) - modified = models.DateTimeField(auto_now=True) - main_page = models.PositiveIntegerField(default=0, db_index=True) - views = models.PositiveIntegerField(default=0) + enable = ClientManager() + #set manager of this model + objects = ExpoManager() def __unicode__(self): diff --git a/functions/admin_forms.py b/functions/admin_forms.py new file mode 100644 index 00000000..bb232bf5 --- /dev/null +++ b/functions/admin_forms.py @@ -0,0 +1,16 @@ +from django import forms +from django.conf import settings + + +class AdminForm(forms.Form): + model = None + + def __init__(self, *args, **kwargs): + """ + create dynamical translated fields fields + """ + if len(settings.LANGUAGES) in range(10): + for lid, (code, name) in enumerate(settings.LANGUAGES): + # uses enumerate for detect iteration number + # first iteration is a default lang so it required fields + required = True if lid == 0 else False diff --git a/functions/admin_views.py b/functions/admin_views.py new file mode 100644 index 00000000..46287b9f --- /dev/null +++ b/functions/admin_views.py @@ -0,0 +1,62 @@ +from django.views.generic import FormView +from django.shortcuts import render_to_response, get_object_or_404 +from django.http import HttpResponseRedirect +from django.conf import settings + +class AdminView(FormView): + obj = None + + def set_obj(self): + url = self.kwargs.get('url') + if url: + obj = get_object_or_404(self.model, url=url) + self.obj = obj + return obj + slug = self.kwargs.get('slug') + if slug: + obj = get_object_or_404(self.model, slug=slug) + self.obj = obj + return obj + self.obj = None + return None + + def get_context_data(self, **kwargs): + context = super(AdminView, self).get_context_data(**kwargs) + self.set_obj() + context['object'] = self.obj + context['languages'] = settings.LANGUAGES + return context + + def form_valid(self, form): + self.set_obj() + form.save(obj=self.obj) + return HttpResponseRedirect(self.success_url) + # example get_form + """ + def get_form(self, form_class): + if self.request.POST: + return super(AdminView, self).get_form(form_class) + self.set_obj() + if self.obj: + obj = self.obj + data = {} + data['theme'] = [item.id for item in article.theme.all()] + data['exposition'] = article.exposition + data['conference'] = article.conference + a = ','.join(['%s:%s'%(item.id, item.name) for item in article.tag.all()]) + + data['tag'] = ','.join(['%s:%s'%(item.id, item.name) for item in article.tag.all()]) + for code, name in settings.LANGUAGES: + obj = Article._meta.translations_model.objects.get(language_code = code,master__id=getattr(article, 'id')) #access to translated fields + data['main_title_%s' % code] = obj.main_title + data['preview_%s' % code] = obj.preview + data['description_%s' % code] = obj.description + data['title_%s' % code] = obj.title + data['keywords_%s' % code] = obj.keywords + data['descriptions_%s' % code] = obj.descriptions + form = form_class(data) + #form.fields['tag'].widget.attrs['data-init-text'] = [item.name for item in article.tag.all()] + return form_class(data) + else: + return form_class() + """ \ No newline at end of file diff --git a/functions/custom_views.py b/functions/custom_views.py index c3a8f53c..a9f9ebf2 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -23,7 +23,7 @@ from country.models import Country @login_required -def filtered_list(request, objects, template, item_per_page=20): +def filtered_list(request, objects, template, item_per_page=settings.ADMIN_PAGINATION): """ Return template with objects in it with pagination item_per_page - how many objects view in the one page @@ -45,7 +45,7 @@ from django.db.models.loading import get_model from theme.models import Theme @staff_member_required -def objects_list(request, Model, template, item_per_page=20): +def objects_list(request, Model, template, item_per_page=settings.ADMIN_PAGINATION): """ Return template with all objects of model Model Model - objects Model diff --git a/functions/search_forms.py b/functions/search_forms.py index ce554950..e15c6ae2 100644 --- a/functions/search_forms.py +++ b/functions/search_forms.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +import pytils from django import forms +from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from haystack.query import EmptySearchQuerySet, SearchQuerySet @@ -88,18 +90,23 @@ class ExpositionSearchForm(forms.Form): q = forms.CharField(label=_(u'Поиск'), required=False) w = forms.CharField(label=_(u'Где'), required=False) - th = forms.ModelMultipleChoiceField(label=_(u'Тематика'), queryset=Theme.objects.all(), - required=False, widget=forms.SelectMultiple()) - tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.SelectMultiple()) + th = forms.MultipleChoiceField(label=_(u'Тематика'), choices=[(item.id, item.name) for item in Theme.objects.all()], + required=False, widget=forms.CheckboxSelectMultiple()) + tg = forms.CharField(label=_(u'Теги'), required=False, widget=forms.CheckboxSelectMultiple()) - area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.language()], + area = forms.MultipleChoiceField(label=_(u'Регион'), choices=[(item.id, item.name) for item in Area.objects.all_sorted()], required=False, widget=forms.CheckboxSelectMultiple()) - co = forms.MultipleChoiceField(label=_(u'Страна'), choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ - .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ - .order_by('translations__name').distinct()], - required=False, widget=forms.CheckboxSelectMultiple()) - #co = forms.CharField(label=_(u'Страна'), required=False, widget=forms.SelectMultiple()) - ci = forms.CharField(label=_(u'Город'), required=False, widget=forms.SelectMultiple()) + co = forms.MultipleChoiceField(label=_(u'Страна'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in Country.objects.select_related('exposition_country')\ + .filter(exposition_country__country__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) + + ci = forms.MultipleChoiceField(label=_(u'Город'), required=False, widget=forms.CheckboxSelectMultiple(), + choices=[(item.id, item.name) for item in City.objects.select_related('exposition_city')\ + .filter(exposition_city__city__isnull=False, translations__language_code=translation.get_language())\ + .order_by('translations__name').distinct()] + ) fr = forms.DateField(required=False, widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateFrom', @@ -108,60 +115,75 @@ class ExpositionSearchForm(forms.Form): widget=forms.DateInput(attrs={'class': 'date', 'id': 'dateTo', 'placeholder': _(u'дд.мм.гггг')})) - def get_places_display(self): - display = '' - self.is_valid() - area = self.cleaned_data['area'] - area_choices = self.fields['area'].choices + def __init__(self, *args, **kwargs): + super(ExpositionSearchForm, self).__init__(*args, **kwargs) + self.theme_classes = {item.id:item.generate_search_class() for item in Theme.objects.all()} + """ + theme_with_tags = {} - places = [choice[1] for choice in area_choices if str(choice[0]) in area] + for tag in list(Tag.objects.language().filter()): + if tag.theme_id in theme_with_tags: + theme_with_tags[tag.theme_id].append({'name': tag.name, 'id':tag.id}) + else: + theme_with_tags[tag.theme_id] = [{'name': tag.name, 'id':tag.id}] - country = self.cleaned_data['co'] - country_choices = self.fields['co'].choices - places += [choice[1] for choice in country_choices if str(choice[0]) in country] - - if not places: - return _(u'Не важно') - return ', '.join(places) + #dsds + self.theme_with_tags = theme_with_tags + """ - """ - def clean_area(self): - area = self.cleaned_data.get('area') - if area: - res = ast.literal_eval(area) - return res - return area + def get_places_display(self): + if self.is_valid(): + area = self.cleaned_data['area'] + area_choices = self.fields['area'].choices - def clean_co(self): + places = [choice[1] for choice in area_choices if str(choice[0]) in area] - co = self.cleaned_data.get('co') - if co: - res = ast.literal_eval(co) - return res - return co + country = self.cleaned_data['co'] + country_choices = self.fields['co'].choices - """ + places += [choice[1] for choice in country_choices if str(choice[0]) in country] - def clean_ci(self): + city = self.cleaned_data['ci'] + city_choices = self.fields['ci'].choices - ci = self.cleaned_data.get('ci') - if ci: - res = ast.literal_eval(ci) - return res - return ci + places += [choice[1] for choice in city_choices if str(choice[0]) in city] - def clean_th(self): - th = self.cleaned_data.get('th') - if th: - res = ast.literal_eval(th) - return res - return th + if not places: + return _(u'Не важно') + if len(places) == 1: + return ', '.join(places) + else: + st = _(u' и еще ')+str(len(places)-1)+u' %s'%pytils.numeral.choose_plural(len(places)-1, (_(u"позиция"), _(u"позиции"), _(u"позиций"))) + return places[0]+ st + + else: + return _(u'Не важно') + + def get_themes_display(self): + if self.is_valid(): + th = self.cleaned_data['th'] + themes_choices = self.fields['th'].choices + + themes = [choice[1] for choice in themes_choices if str(choice[0]) in th] + + if not themes: + return _(u'Не важно') + if len(themes) == 1: + return ', '.join(themes) + else: + st = _(u' и еще ')+str(len(themes)-1)+u' %s'%pytils.numeral.choose_plural(len(themes)-1, (_(u"позиция"), _(u"позиции"), _(u"позиций"))) + return themes[0]+ st + + + else: + return _(u'Не важно') + def clean_tg(self): @@ -197,17 +219,38 @@ class ExpositionSearchForm(forms.Form): sqs = sqs.filter(data_begin__gte=fr) if to: sqs = sqs.filter(data_begin__lte=to) - if area: - sqs = sqs.filter(area_id__in=area) - if co: - sqs = sqs.filter(country_id__in=co) - if ci: - sqs = sqs.filter(city_id__in=ci) if th: sqs = sqs.filter(theme__in=th) if tg: sqs = sqs.filter(tag__in=tg) + place_filter = None + + + if area: + if place_filter: + place_filter = place_filter | Q(area_id__in=area) + else: + place_filter = Q(area_id__in=area) + #sqs = sqs.filter(area_id__in=area) + if co: + if place_filter: + place_filter = place_filter | Q(country_id__in=co) + else: + place_filter = Q(country_id__in=co) + + #sqs = sqs.filter(country_id__in=co) + if ci: + if place_filter: + place_filter = place_filter | Q(city_id__in=ci) + else: + place_filter = Q(city_id__in=ci) + + #sqs = sqs.filter(city_id__in=ci) + if place_filter: + sqs = sqs.filter(place_filter) + + return sqs.order_by('data_begin') diff --git a/photologue/admin.py b/photologue/admin.py index 331da3e7..ec286162 100644 --- a/photologue/admin.py +++ b/photologue/admin.py @@ -285,6 +285,7 @@ class AdminViewObject(FormView): self.obj = None def form_valid(self, form): + self.set_obj() form.save(obj=self.obj) return HttpResponseRedirect(self.success_url) @@ -351,10 +352,12 @@ class GalleryView(AdminViewObject): class PhotoListView(ListView): + paginate_by = settings.ADMIN_PAGINATION model = Photo template_name = 'photogallery/admin_photo_list.html' class GalleryListView(ListView): + paginate_by = settings.ADMIN_PAGINATION model = Gallery template_name = 'photogallery/admin_gallery_list.html' \ No newline at end of file diff --git a/photologue/forms.py b/photologue/forms.py index 18decbcf..630fbec7 100644 --- a/photologue/forms.py +++ b/photologue/forms.py @@ -33,11 +33,8 @@ class GalleryForm(forms.Form): return gallery - - class PhotoForm(forms.Form): - image = forms.ImageField(label=u'Изображение') - + image = forms.ImageField(label=u'Изображение', required=False) def __init__(self, *args, **kwargs): """ @@ -52,17 +49,19 @@ class PhotoForm(forms.Form): # first iteration is a default lang so it required fields required = True if lid == 0 else False self.fields['title_%s' % code] = forms.CharField(label='Описание', required=required) - self.fields['caption_%s' % code] = forms.CharField(label='Заголовок', required=required) + self.fields['caption_%s' % code] = forms.CharField(label='Заголовок', required=False) def save(self, obj=None): data = self.cleaned_data #create new Photo object or get exists if not obj: photo = Photo() + photo.image = data['image'] else: photo = obj + photo.image = obj.image + - photo.image = data['image'] fill_with_signal(Photo, photo, data) return photo diff --git a/photologue/management/commands/photologue_exposize.py b/photologue/management/commands/photologue_exposize.py new file mode 100644 index 00000000..e468d011 --- /dev/null +++ b/photologue/management/commands/photologue_exposize.py @@ -0,0 +1,26 @@ +from django.core.management.base import BaseCommand +from photologue.models import PhotoSize + + +class Command(BaseCommand): + def handle(self, *args, **options): + + PhotoSize.objects.create(name='admin_thumbnail', + width=100, + height=75, + crop=True, + pre_cache=True, + increment_count=False) + PhotoSize.objects.create(name='client_thumbnail', + width=256, + height=140, + crop=True, + pre_cache=True, + increment_count=False) + + PhotoSize.objects.create(name='display', + width=730, + height=533, + crop=True, + pre_cache=True, + increment_count=True) \ No newline at end of file diff --git a/photologue/models.py b/photologue/models.py index 52e8cb7e..e4f9f7b3 100644 --- a/photologue/models.py +++ b/photologue/models.py @@ -159,10 +159,18 @@ IMAGE_FILTERS_HELP_TEXT = _( 'Chain multiple filters using the following pattern "FILTER_ONE->FILTER_TWO->FILTER_THREE". Image filters will be applied in order. The following filters are available: %s.' % (', '.join(filter_names))) +class UserMark(models.Model): + user = models.ForeignKey('accounts.User', related_name='marks') + top = models.PositiveSmallIntegerField() + left = models.PositiveSmallIntegerField() + height = models.PositiveSmallIntegerField() + width = models.PositiveSmallIntegerField() + + @python_2_unicode_compatible class Gallery(TranslatableModel): translations = TranslatedFields( - title = models.CharField(_('title'), max_length=50), + title = models.CharField(_('title'), max_length=200), description = models.TextField(_('description'), blank=True) ) date_added = models.DateTimeField(_('date published'), @@ -170,7 +178,8 @@ class Gallery(TranslatableModel): slug = models.SlugField(_('title slug'), unique=True, - help_text=_('A "slug" is a unique URL-friendly title for an object.')) + help_text=_('A "slug" is a unique URL-friendly title for an object.'), + max_length=200) is_public = models.BooleanField(_('is public'), default=True, @@ -681,14 +690,15 @@ class ImageModel(models.Model): class Photo(TranslatableModel, ImageModel): translations = TranslatedFields( title = models.CharField(_('title'), - max_length=50), + max_length=200), caption = models.TextField(_('caption'), blank=True) ) slug = models.SlugField(_('slug'), unique=True, - help_text=_('A "slug" is a unique URL-friendly title for an object.')) + help_text=_('A "slug" is a unique URL-friendly title for an object.'), + max_length=200) date_added = models.DateTimeField(_('date added'), default=now) @@ -699,6 +709,8 @@ class Photo(TranslatableModel, ImageModel): sites = models.ManyToManyField(Site, verbose_name=_(u'sites'), blank=True, null=True) + users = models.ManyToManyField(UserMark, null=True) + objects = PhotologueManager() class Meta: @@ -1082,6 +1094,9 @@ def add_default_site(instance, created, **kwargs): if instance.sites.exists(): return instance.sites.add(Site.objects.get_current()) + + + post_save.connect(add_default_site, sender=Gallery) post_save.connect(add_default_site, sender=Photo) diff --git a/photoreport/models.py b/photoreport/models.py index 0f440994..513970fe 100644 --- a/photoreport/models.py +++ b/photoreport/models.py @@ -3,19 +3,7 @@ from django.db import models from django.db.models.signals import post_save from hvad.models import TranslatableModel, TranslatedFields from django.contrib.contenttypes import generic -from functions.signal_handlers import post_save_handler -from accounts.models import User -from company.models import Company -from django.contrib.contenttypes import generic from django.db.models.signals import post_save -# models -from directories.models import Language, Currency -from city.models import City -from service.models import Service -# func -from functions.custom_fields import EnumField -from bitfield import BitField -from functions.db import db_table_exists from functions.signal_handlers import post_save_handler diff --git a/place_exposition/admin.py b/place_exposition/admin.py index b497bc4f..b9232e85 100644 --- a/place_exposition/admin.py +++ b/place_exposition/admin.py @@ -185,6 +185,75 @@ def exposition_change(request, url): args['files'] = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(place), object_id=getattr(place, 'id')) args['obj_id'] = exposition_id + args['object'] = place + + + return render_to_response('place_exposition_add.html', args) + + +#test---------------------- +from functions.admin_views import AdminView + + +class PlaceExpositionView(AdminView): + form_class = ExpositionForm + model = PlaceExposition + success_url = 'admin/place_exposition/all/' + template_name = 'admin/place_exposition/place_exposition.html' + + def get_form(self, form_class): + if self.request.POST: + return super(PlaceExpositionView, self).get_form(form_class) + obj = self.set_obj() + if obj: + data = {'type': obj.type, 'address': obj.address, + 'phone': obj.phone, 'fax': obj.fax, 'web_page': obj.web_page, 'email': obj.email, + 'foundation_year': obj.foundation_year, 'total_area': obj.total_area, + 'closed_area': obj.closed_area, 'open_area': obj.open_area, + 'total_pavilions': obj.total_pavilions, 'total_halls': obj.total_halls, 'wifi':obj.wifi, + 'bank': obj.bank, 'children_room': obj.children_room, 'video_link': obj.video_link, + 'disabled_service': obj.disabled_service, 'conference_centre': obj.conference_centre, + 'business_centre': obj.business_centre, 'online_registration': obj.online_registration, + 'cafe': obj.cafe, 'terminals': obj.terminals, 'parking': obj.parking, + 'press_centre': obj.press_centre, 'mobile_application': obj.mobile_application, + 'place_exposition_id':obj.id} + + data['country'] = obj.country_id + data['city'] = obj.city_id + + for code, name in settings.LANGUAGES: + trans_obj = self.model._meta.translations_model.objects.get(language_code = code,master__id=obj.id) #access to translated fields + data['name_%s'%code] = trans_obj.name + data['main_title_%s'%code] = trans_obj.main_title + data['description_%s'%code] = trans_obj.description + data['adress_%s'%code] = trans_obj.adress + data['total_year_action_%s'%code] = trans_obj.total_year_action + data['title_%s'%code] = trans_obj.title + data['keywords_%s'%code] = trans_obj.keywords + data['descriptions_%s'%code] = trans_obj.descriptions + + form =form_class(initial=data) + form.fields['city'].widget.attrs['data-init-text'] = obj.city.name + return form + else: + return form_class() + + def halls(self): + obj = self.set_obj() + if obj: + HallFormSet = modelformset_factory(Hall, form=HallForm, exclude=('place_exposition',)) + #get existing halls + halls = Hall.objects.filter(place_exposition=getattr(obj, 'id')) + #fill HallFormSet + formset = HallFormSet(queryset=halls) + else: + HallFormSet = formset_factory(HallForm) + formset = HallFormSet() + return formset + + def get_context_data(self, **kwargs): + context = super(PlaceExpositionView, self).get_context_data(**kwargs) + context['formset'] = self.halls() + return context - return render_to_response('place_exposition_add.html', args) \ No newline at end of file diff --git a/place_exposition/admin_urls.py b/place_exposition/admin_urls.py index 6fe5da6a..3a3c4b6e 100644 --- a/place_exposition/admin_urls.py +++ b/place_exposition/admin_urls.py @@ -1,10 +1,15 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url +from admin import PlaceExpositionView urlpatterns = patterns('place_exposition.admin', + url(r'^all/$', 'exposition_all'), url(r'^add.*/$', 'exposition_add'), url(r'^delete/(?P.*)/$', 'exposition_delete'), url(r'^change/(?P.*)/$', 'exposition_change'), url(r'^copy/(?P.*)/$', 'place_exposition_copy'), - url(r'^all/$', 'exposition_all'), + url(r'^$', PlaceExpositionView.as_view()), + url(r'^(?P.*)/$', PlaceExpositionView.as_view()), + + ) diff --git a/place_exposition/forms.py b/place_exposition/forms.py index 2fa08262..27f6300a 100644 --- a/place_exposition/forms.py +++ b/place_exposition/forms.py @@ -291,4 +291,7 @@ class HallForm(forms.ModelForm): def clean_capacity(self): cleaned_data = super(HallForm, self).clean() capacity = cleaned_data.get('capacity').strip() - return is_positive_integer(capacity, 'Вместимость должна состоять из цифр') \ No newline at end of file + return is_positive_integer(capacity, 'Вместимость должна состоять из цифр') + +class TestForm(forms.Form): + pass diff --git a/place_exposition/management/commands/convert_photo.py b/place_exposition/management/commands/convert_photo.py new file mode 100644 index 00000000..f0cfde24 --- /dev/null +++ b/place_exposition/management/commands/convert_photo.py @@ -0,0 +1,61 @@ +from django.core.management.base import BaseCommand, CommandError +from place_exposition.models import PlaceExposition +from django.contrib.sites.models import Site +from photologue.models import Gallery, Photo +from file.models import FileModel +from django.core.files import File +from django.core.files.temp import NamedTemporaryFile +import urllib2 +from django.conf import settings + + +#img_temp = NamedTemporaryFile(delete=True) +#img_temp.write(urllib2.urlopen(url).read()) +#img_temp.flush() + +#im.file.save(img_filename, File(img_temp)) + + +def convert_photo(photo): + domain = 'http://hit.expomap.ru' + url = domain+photo.file_path.url + file_name = url.split('/')[-1] + download_to = settings.MEDIA_ROOT+'photologue/'+file_name + try: + response = urllib2.urlopen(url, timeout=5) + except: + print('download error') + return None + + with open(download_to,'wb') as f: + f.write(response.read()) + f.close() + file_name = 'photologue/'+file_name + new_photo = Photo(image=file_name) + new_photo.translate('en') + new_photo.title = file_name.replace('photologue/', '') + new_photo.save() + return new_photo + +def handle_place(place): + + domain = 'http://hit.expomap.ru' + for photo in list(place.photos.all()): + new_photo = convert_photo(photo) + place.upload_photo(new_photo) + print(place) + + + +class Command(BaseCommand): + def handle(self, *args, **options): + for place in PlaceExposition.objects.all('en'): + if place.photos.all().exists(): + handle_place(place) + + """ + url = 'adnec-abu-dhabi-national-exhibitions-center' + p = PlaceExposition.objects.get(url=url) + handle_place(p) + """ + diff --git a/place_exposition/models.py b/place_exposition/models.py index 945898a9..15017d5b 100644 --- a/place_exposition/models.py +++ b/place_exposition/models.py @@ -5,6 +5,8 @@ from django.contrib.contenttypes import generic from django.db.models.signals import post_save, pre_save from django.utils.translation import ugettext as _ from functools import partial +from django.conf import settings +from functions.translate import fill_with_signal # from hvad.models import TranslatableModel, TranslatedFields, TranslationManager @@ -17,6 +19,7 @@ from functions.model_mixin import ExpoMixin from exposition.models import Exposition from place_conference.models import PlaceConference +from photologue.models import Gallery EXPOSITION_TYPE = (('Exposition complex', u'Выставочный комплекс'), ('Convention centre', u'Конгрессно-выставочный центр'), ('Exposition centre', u'Выставочный центр'),) @@ -36,6 +39,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin): url = models.SlugField(unique=True, max_length=255) country = models.ForeignKey('country.Country', on_delete=models.PROTECT) + photogallery = models.ForeignKey('photologue.Gallery', null=True, blank=True) city = models.ForeignKey('city.City', on_delete=models.PROTECT, related_name='place_expositions') #type uses EnumField for creating Enum type field in Mysql database type = EnumField(values = [item1 for item1, item2 in EXPOSITION_TYPE]) @@ -95,6 +99,37 @@ class PlaceExposition(TranslatableModel, ExpoMixin): class Meta: ordering = ['translations__name'] + def get_gallery(self): + if self.photogallery: + return self.photogallery + + data = {} + model = type(self) + for code, name in settings.LANGUAGES: + obj = model._meta.translations_model.objects.get(language_code = code,master__id=self.id) #access to translated fields + data['title_%s'%code] = obj.name + data['description_%s'%code] = obj.description + + gallery = Gallery() + + fill_with_signal(Gallery, gallery, data) + self.photogallery = gallery + self.save() + + + return gallery + + + def upload_photo(self, photo ,gallery=None): + """ + uploading photo to gallery + """ + if gallery is None: + gallery = self.get_gallery() + + gallery.photos.add(photo) + + def get_index_text(self): names = [tr.name for tr in self.translations.all()] return names diff --git a/proj/settings.py b/proj/settings.py index 85faf41c..a120e2d0 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -18,13 +18,12 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'test', # Or path to database file if using sqlite3. - # The following settings are not used with sqlite3: - 'USER': 'root', + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'test2', + 'USER': 'kotzilla', 'PASSWORD': 'qazedc', - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. + 'HOST': '', + 'PORT': '', } } ''' @@ -161,6 +160,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( MIDDLEWARE_CLASSES = ( # 'django.middleware.cache.UpdateCacheMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', @@ -173,8 +173,10 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware',#должно быть последним полем + ) + ROOT_URLCONF = 'proj.urls' # Python dotted path to the WSGI application used by Django's runserver. @@ -339,9 +341,12 @@ INSTALLED_APPS = ( 'password_reset', #'social_auth', 'social.apps.django_app.default', - 'south', - #'debug_toolbar', + # 'south', +# 'debug_toolbar', ) +#INTERNAL_IPS = ('176.121.5.82',) +#DEBUG_TOOLBAR_PATCH_SETTINGS = False + # search backend HAYSTACK_CONNECTIONS = { @@ -389,10 +394,11 @@ CALLBACK_EMAIL = 'kotzilla@ukr.net' BOOKING_AID = '333667' - +""" try: from local import * except ImportError, e: from production import * - +""" +ADMIN_PAGINATION = 20 TEMPLATE_DEBUG = DEBUG \ No newline at end of file diff --git a/proj/urls.py b/proj/urls.py index 2f97aa4b..88603a6b 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -6,11 +6,11 @@ from core.simple_index_view import AdvertisingView, AboutView from views import MainPageView from django.http import HttpResponse -def robots(request): - return HttpResponse('User-agent: * \nDisallow: /', content_type='text/plain') +def check_forward(request, *args, **kwargs): + return HttpResponse(request.META.get('HTTP_X_FORWARDED_FOR', None)) urlpatterns = patterns('', - url(r'^robots.txt$', robots), + url(r'^bla/$', check_forward), url(r'^$', MainPageView.as_view()), url(r'^theme/', include('theme.urls')), url(r'^', include('accounts.urls')), @@ -37,6 +37,7 @@ urlpatterns = patterns('', url(r'^contacts/$', AboutView.as_view()), url(r'^events/search/$', EventSearchView.as_view()), url(r'^places/search/$', PlaceSearchView.as_view()), + url(r'^places/(?P.*)/photo/(?P\d+)/$', PlacePhotoView.as_view()), url(r'^places/(?P.*)/photo/$', PlacePhotoView.as_view()), url(r'^places/(?P.*)/(?P\d+)/$', PlaceListView.as_view()), url(r'^places/(?P\d+)/$', PlaceListView.as_view()), @@ -72,8 +73,10 @@ urlpatterns += patterns('', # url(r'^profile/change-password/', 'accounts.views.change_password'), ) + if settings.DEBUG: import debug_toolbar urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)), ) + diff --git a/settings/templatetags/template_filters.py b/settings/templatetags/template_filters.py index 0ad33831..89f83c9a 100644 --- a/settings/templatetags/template_filters.py +++ b/settings/templatetags/template_filters.py @@ -14,6 +14,10 @@ from photoreport.models import Photoreport register = template.Library() +@register.filter +def get_item(dictionary, key): + return dictionary.get(key) + @register.filter def phone(value): # Only one argument. """Converts a string into all lowercase""" @@ -60,8 +64,10 @@ def generate_url(value, arg=None): if models.get(item.get('url')): result.append(models.get(item.get('url'))) else: - - result.append(item.get('type')+'-'+item.get('url')) + if item.get('url'): + result.append(item.get('type')+'-'+item.get('url')) + else: + result.append(item.get('type')) if item.get('type') == arg: return '/'.join(result) diff --git a/static/client b/static/client new file mode 120000 index 00000000..52754f3f --- /dev/null +++ b/static/client @@ -0,0 +1 @@ +/home/www/proj/templates/client/static_client \ No newline at end of file diff --git a/static/client/css/idangerous.swiper.css b/static/client.old/css/idangerous.swiper.css similarity index 100% rename from static/client/css/idangerous.swiper.css rename to static/client.old/css/idangerous.swiper.css diff --git a/static/client/css/idangerous.swiper.scrollbar.css b/static/client.old/css/idangerous.swiper.scrollbar.css similarity index 100% rename from static/client/css/idangerous.swiper.scrollbar.css rename to static/client.old/css/idangerous.swiper.scrollbar.css diff --git a/static/client/css/jquery-ui-1.10.3.custom.css b/static/client.old/css/jquery-ui-1.10.3.custom.css similarity index 100% rename from static/client/css/jquery-ui-1.10.3.custom.css rename to static/client.old/css/jquery-ui-1.10.3.custom.css diff --git a/static/client/css/jquery.fancybox.css b/static/client.old/css/jquery.fancybox.css similarity index 100% rename from static/client/css/jquery.fancybox.css rename to static/client.old/css/jquery.fancybox.css diff --git a/static/client/css/jquery.mCustomScrollbar.css b/static/client.old/css/jquery.mCustomScrollbar.css similarity index 100% rename from static/client/css/jquery.mCustomScrollbar.css rename to static/client.old/css/jquery.mCustomScrollbar.css diff --git a/static/client/css/main.css b/static/client.old/css/main.css similarity index 100% rename from static/client/css/main.css rename to static/client.old/css/main.css diff --git a/static/client/css/normalize.css b/static/client.old/css/normalize.css similarity index 100% rename from static/client/css/normalize.css rename to static/client.old/css/normalize.css diff --git a/static/client/css/normalize.min.css b/static/client.old/css/normalize.min.css similarity index 100% rename from static/client/css/normalize.min.css rename to static/client.old/css/normalize.min.css diff --git a/static/client/css/pages/exposition_by.css b/static/client.old/css/pages/exposition_by.css similarity index 100% rename from static/client/css/pages/exposition_by.css rename to static/client.old/css/pages/exposition_by.css diff --git a/static/client/css/phototag.css b/static/client.old/css/phototag.css similarity index 100% rename from static/client/css/phototag.css rename to static/client.old/css/phototag.css diff --git a/static/client/css/regions.css b/static/client.old/css/regions.css similarity index 100% rename from static/client/css/regions.css rename to static/client.old/css/regions.css diff --git a/static/client/css/select2.css b/static/client.old/css/select2.css similarity index 100% rename from static/client/css/select2.css rename to static/client.old/css/select2.css diff --git a/static/client/fonts/pfdindisplaypro-bold-webfont.eot b/static/client.old/fonts/pfdindisplaypro-bold-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-bold-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-bold-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-bold-webfont.svg b/static/client.old/fonts/pfdindisplaypro-bold-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-bold-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-bold-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-bold-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-bold-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-bold-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-bold-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-bold-webfont.woff b/static/client.old/fonts/pfdindisplaypro-bold-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-bold-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-bold-webfont.woff diff --git a/static/client/fonts/pfdindisplaypro-italic-webfont.eot b/static/client.old/fonts/pfdindisplaypro-italic-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-italic-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-italic-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-italic-webfont.svg b/static/client.old/fonts/pfdindisplaypro-italic-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-italic-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-italic-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-italic-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-italic-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-italic-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-italic-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-italic-webfont.woff b/static/client.old/fonts/pfdindisplaypro-italic-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-italic-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-italic-webfont.woff diff --git a/static/client/fonts/pfdindisplaypro-light-webfont.eot b/static/client.old/fonts/pfdindisplaypro-light-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-light-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-light-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-light-webfont.svg b/static/client.old/fonts/pfdindisplaypro-light-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-light-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-light-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-light-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-light-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-light-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-light-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-light-webfont.woff b/static/client.old/fonts/pfdindisplaypro-light-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-light-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-light-webfont.woff diff --git a/static/client/fonts/pfdindisplaypro-med-webfont.eot b/static/client.old/fonts/pfdindisplaypro-med-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-med-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-med-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-med-webfont.svg b/static/client.old/fonts/pfdindisplaypro-med-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-med-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-med-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-med-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-med-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-med-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-med-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-med-webfont.woff b/static/client.old/fonts/pfdindisplaypro-med-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-med-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-med-webfont.woff diff --git a/static/client/fonts/pfdindisplaypro-reg-webfont.eot b/static/client.old/fonts/pfdindisplaypro-reg-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-reg-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-reg-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-reg-webfont.svg b/static/client.old/fonts/pfdindisplaypro-reg-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-reg-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-reg-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-reg-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-reg-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-reg-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-reg-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-reg-webfont.woff b/static/client.old/fonts/pfdindisplaypro-reg-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-reg-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-reg-webfont.woff diff --git a/static/client/fonts/pfdindisplaypro-thin-webfont.eot b/static/client.old/fonts/pfdindisplaypro-thin-webfont.eot similarity index 100% rename from static/client/fonts/pfdindisplaypro-thin-webfont.eot rename to static/client.old/fonts/pfdindisplaypro-thin-webfont.eot diff --git a/static/client/fonts/pfdindisplaypro-thin-webfont.svg b/static/client.old/fonts/pfdindisplaypro-thin-webfont.svg similarity index 100% rename from static/client/fonts/pfdindisplaypro-thin-webfont.svg rename to static/client.old/fonts/pfdindisplaypro-thin-webfont.svg diff --git a/static/client/fonts/pfdindisplaypro-thin-webfont.ttf b/static/client.old/fonts/pfdindisplaypro-thin-webfont.ttf similarity index 100% rename from static/client/fonts/pfdindisplaypro-thin-webfont.ttf rename to static/client.old/fonts/pfdindisplaypro-thin-webfont.ttf diff --git a/static/client/fonts/pfdindisplaypro-thin-webfont.woff b/static/client.old/fonts/pfdindisplaypro-thin-webfont.woff similarity index 100% rename from static/client/fonts/pfdindisplaypro-thin-webfont.woff rename to static/client.old/fonts/pfdindisplaypro-thin-webfont.woff diff --git a/static/client/fonts/pts55f-webfont.eot b/static/client.old/fonts/pts55f-webfont.eot similarity index 100% rename from static/client/fonts/pts55f-webfont.eot rename to static/client.old/fonts/pts55f-webfont.eot diff --git a/static/client/fonts/pts55f-webfont.ttf b/static/client.old/fonts/pts55f-webfont.ttf similarity index 100% rename from static/client/fonts/pts55f-webfont.ttf rename to static/client.old/fonts/pts55f-webfont.ttf diff --git a/static/client/fonts/pts55f-webfont.woff b/static/client.old/fonts/pts55f-webfont.woff similarity index 100% rename from static/client/fonts/pts55f-webfont.woff rename to static/client.old/fonts/pts55f-webfont.woff diff --git a/static/client/fonts/pts75f-webfont.eot b/static/client.old/fonts/pts75f-webfont.eot similarity index 100% rename from static/client/fonts/pts75f-webfont.eot rename to static/client.old/fonts/pts75f-webfont.eot diff --git a/static/client/fonts/pts75f-webfont.ttf b/static/client.old/fonts/pts75f-webfont.ttf similarity index 100% rename from static/client/fonts/pts75f-webfont.ttf rename to static/client.old/fonts/pts75f-webfont.ttf diff --git a/static/client/fonts/pts75f-webfont.woff b/static/client.old/fonts/pts75f-webfont.woff similarity index 100% rename from static/client/fonts/pts75f-webfont.woff rename to static/client.old/fonts/pts75f-webfont.woff diff --git a/static/client/img/1.png b/static/client.old/img/1.png similarity index 100% rename from static/client/img/1.png rename to static/client.old/img/1.png diff --git a/static/client/img/2.png b/static/client.old/img/2.png similarity index 100% rename from static/client/img/2.png rename to static/client.old/img/2.png diff --git a/static/client/img/Thumbs.db b/static/client.old/img/Thumbs.db similarity index 100% rename from static/client/img/Thumbs.db rename to static/client.old/img/Thumbs.db diff --git a/static/client/img/_del-temp/Thumbs.db b/static/client.old/img/_del-temp/Thumbs.db similarity index 100% rename from static/client/img/_del-temp/Thumbs.db rename to static/client.old/img/_del-temp/Thumbs.db diff --git a/static/client/img/_del-temp/banner-2.gif b/static/client.old/img/_del-temp/banner-2.gif similarity index 100% rename from static/client/img/_del-temp/banner-2.gif rename to static/client.old/img/_del-temp/banner-2.gif diff --git a/static/client/img/_del-temp/banner.gif b/static/client.old/img/_del-temp/banner.gif similarity index 100% rename from static/client/img/_del-temp/banner.gif rename to static/client.old/img/_del-temp/banner.gif diff --git a/static/client/img/_del-temp/bnrs-2.jpg b/static/client.old/img/_del-temp/bnrs-2.jpg similarity index 100% rename from static/client/img/_del-temp/bnrs-2.jpg rename to static/client.old/img/_del-temp/bnrs-2.jpg diff --git a/static/client/img/_del-temp/bnrs.jpg b/static/client.old/img/_del-temp/bnrs.jpg similarity index 100% rename from static/client/img/_del-temp/bnrs.jpg rename to static/client.old/img/_del-temp/bnrs.jpg diff --git a/static/client/img/_del-temp/cl-logo-1.png b/static/client.old/img/_del-temp/cl-logo-1.png similarity index 100% rename from static/client/img/_del-temp/cl-logo-1.png rename to static/client.old/img/_del-temp/cl-logo-1.png diff --git a/static/client/img/_del-temp/cl-logo-2.png b/static/client.old/img/_del-temp/cl-logo-2.png similarity index 100% rename from static/client/img/_del-temp/cl-logo-2.png rename to static/client.old/img/_del-temp/cl-logo-2.png diff --git a/static/client/img/_del-temp/cl-logo-3.png b/static/client.old/img/_del-temp/cl-logo-3.png similarity index 100% rename from static/client/img/_del-temp/cl-logo-3.png rename to static/client.old/img/_del-temp/cl-logo-3.png diff --git a/static/client/img/_del-temp/counter-1.gif b/static/client.old/img/_del-temp/counter-1.gif similarity index 100% rename from static/client/img/_del-temp/counter-1.gif rename to static/client.old/img/_del-temp/counter-1.gif diff --git a/static/client/img/_del-temp/counter-2.gif b/static/client.old/img/_del-temp/counter-2.gif similarity index 100% rename from static/client/img/_del-temp/counter-2.gif rename to static/client.old/img/_del-temp/counter-2.gif diff --git a/static/client/img/_del-temp/counter-3.gif b/static/client.old/img/_del-temp/counter-3.gif similarity index 100% rename from static/client/img/_del-temp/counter-3.gif rename to static/client.old/img/_del-temp/counter-3.gif diff --git a/static/client/img/_del-temp/editor.png b/static/client.old/img/_del-temp/editor.png similarity index 100% rename from static/client/img/_del-temp/editor.png rename to static/client.old/img/_del-temp/editor.png diff --git a/static/client/img/_del-temp/event-photo-1.jpg b/static/client.old/img/_del-temp/event-photo-1.jpg similarity index 100% rename from static/client/img/_del-temp/event-photo-1.jpg rename to static/client.old/img/_del-temp/event-photo-1.jpg diff --git a/static/client/img/_del-temp/expo-bn-1.jpg b/static/client.old/img/_del-temp/expo-bn-1.jpg similarity index 100% rename from static/client/img/_del-temp/expo-bn-1.jpg rename to static/client.old/img/_del-temp/expo-bn-1.jpg diff --git a/static/client/img/_del-temp/expo-bn-2-s.jpg b/static/client.old/img/_del-temp/expo-bn-2-s.jpg similarity index 100% rename from static/client/img/_del-temp/expo-bn-2-s.jpg rename to static/client.old/img/_del-temp/expo-bn-2-s.jpg diff --git a/static/client/img/_del-temp/glr-1.jpg b/static/client.old/img/_del-temp/glr-1.jpg similarity index 100% rename from static/client/img/_del-temp/glr-1.jpg rename to static/client.old/img/_del-temp/glr-1.jpg diff --git a/static/client/img/_del-temp/hotel-1.jpg b/static/client.old/img/_del-temp/hotel-1.jpg similarity index 100% rename from static/client/img/_del-temp/hotel-1.jpg rename to static/client.old/img/_del-temp/hotel-1.jpg diff --git a/static/client/img/_del-temp/mail-banner.jpg b/static/client.old/img/_del-temp/mail-banner.jpg similarity index 100% rename from static/client/img/_del-temp/mail-banner.jpg rename to static/client.old/img/_del-temp/mail-banner.jpg diff --git a/static/client/img/_del-temp/mp-phg-1.jpg b/static/client.old/img/_del-temp/mp-phg-1.jpg similarity index 100% rename from static/client/img/_del-temp/mp-phg-1.jpg rename to static/client.old/img/_del-temp/mp-phg-1.jpg diff --git a/static/client/img/_del-temp/mp-phg-1.png b/static/client.old/img/_del-temp/mp-phg-1.png similarity index 100% rename from static/client/img/_del-temp/mp-phg-1.png rename to static/client.old/img/_del-temp/mp-phg-1.png diff --git a/static/client/img/_del-temp/news-1.jpg b/static/client.old/img/_del-temp/news-1.jpg similarity index 100% rename from static/client/img/_del-temp/news-1.jpg rename to static/client.old/img/_del-temp/news-1.jpg diff --git a/static/client/img/_del-temp/news-s-1.jpg b/static/client.old/img/_del-temp/news-s-1.jpg similarity index 100% rename from static/client/img/_del-temp/news-s-1.jpg rename to static/client.old/img/_del-temp/news-s-1.jpg diff --git a/static/client/img/_del-temp/part-logo-1.png b/static/client.old/img/_del-temp/part-logo-1.png similarity index 100% rename from static/client/img/_del-temp/part-logo-1.png rename to static/client.old/img/_del-temp/part-logo-1.png diff --git a/static/client/img/_del-temp/part-logo-2.png b/static/client.old/img/_del-temp/part-logo-2.png similarity index 100% rename from static/client/img/_del-temp/part-logo-2.png rename to static/client.old/img/_del-temp/part-logo-2.png diff --git a/static/client/img/_del-temp/part-logo-3.png b/static/client.old/img/_del-temp/part-logo-3.png similarity index 100% rename from static/client/img/_del-temp/part-logo-3.png rename to static/client.old/img/_del-temp/part-logo-3.png diff --git a/static/client/img/_del-temp/pg-1.jpg b/static/client.old/img/_del-temp/pg-1.jpg similarity index 100% rename from static/client/img/_del-temp/pg-1.jpg rename to static/client.old/img/_del-temp/pg-1.jpg diff --git a/static/client/img/_del-temp/pg-2.jpg b/static/client.old/img/_del-temp/pg-2.jpg similarity index 100% rename from static/client/img/_del-temp/pg-2.jpg rename to static/client.old/img/_del-temp/pg-2.jpg diff --git a/static/client/img/_del-temp/pg-3.jpg b/static/client.old/img/_del-temp/pg-3.jpg similarity index 100% rename from static/client/img/_del-temp/pg-3.jpg rename to static/client.old/img/_del-temp/pg-3.jpg diff --git a/static/client/img/_del-temp/pg-4.jpg b/static/client.old/img/_del-temp/pg-4.jpg similarity index 100% rename from static/client/img/_del-temp/pg-4.jpg rename to static/client.old/img/_del-temp/pg-4.jpg diff --git a/static/client/img/_del-temp/phr-1.jpg b/static/client.old/img/_del-temp/phr-1.jpg similarity index 100% rename from static/client/img/_del-temp/phr-1.jpg rename to static/client.old/img/_del-temp/phr-1.jpg diff --git a/static/client/img/_del-temp/phr-2.jpg b/static/client.old/img/_del-temp/phr-2.jpg similarity index 100% rename from static/client/img/_del-temp/phr-2.jpg rename to static/client.old/img/_del-temp/phr-2.jpg diff --git a/static/client/img/_del-temp/phr-3.jpg b/static/client.old/img/_del-temp/phr-3.jpg similarity index 100% rename from static/client/img/_del-temp/phr-3.jpg rename to static/client.old/img/_del-temp/phr-3.jpg diff --git a/static/client/img/_del-temp/phr-4.jpg b/static/client.old/img/_del-temp/phr-4.jpg similarity index 100% rename from static/client/img/_del-temp/phr-4.jpg rename to static/client.old/img/_del-temp/phr-4.jpg diff --git a/static/client/img/_del-temp/pl-logo-1.png b/static/client.old/img/_del-temp/pl-logo-1.png similarity index 100% rename from static/client/img/_del-temp/pl-logo-1.png rename to static/client.old/img/_del-temp/pl-logo-1.png diff --git a/static/client/img/_del-temp/pl-logo-2.png b/static/client.old/img/_del-temp/pl-logo-2.png similarity index 100% rename from static/client/img/_del-temp/pl-logo-2.png rename to static/client.old/img/_del-temp/pl-logo-2.png diff --git a/static/client/img/_del-temp/place-photo-1.jpg b/static/client.old/img/_del-temp/place-photo-1.jpg similarity index 100% rename from static/client/img/_del-temp/place-photo-1.jpg rename to static/client.old/img/_del-temp/place-photo-1.jpg diff --git a/static/client/img/_del-temp/plan.jpg b/static/client.old/img/_del-temp/plan.jpg similarity index 100% rename from static/client/img/_del-temp/plan.jpg rename to static/client.old/img/_del-temp/plan.jpg diff --git a/static/client/img/_del-temp/pt-logo-1.png b/static/client.old/img/_del-temp/pt-logo-1.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-1.png rename to static/client.old/img/_del-temp/pt-logo-1.png diff --git a/static/client/img/_del-temp/pt-logo-2.png b/static/client.old/img/_del-temp/pt-logo-2.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-2.png rename to static/client.old/img/_del-temp/pt-logo-2.png diff --git a/static/client/img/_del-temp/pt-logo-3.png b/static/client.old/img/_del-temp/pt-logo-3.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-3.png rename to static/client.old/img/_del-temp/pt-logo-3.png diff --git a/static/client/img/_del-temp/pt-logo-4.png b/static/client.old/img/_del-temp/pt-logo-4.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-4.png rename to static/client.old/img/_del-temp/pt-logo-4.png diff --git a/static/client/img/_del-temp/pt-logo-5.png b/static/client.old/img/_del-temp/pt-logo-5.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-5.png rename to static/client.old/img/_del-temp/pt-logo-5.png diff --git a/static/client/img/_del-temp/pt-logo-6.png b/static/client.old/img/_del-temp/pt-logo-6.png similarity index 100% rename from static/client/img/_del-temp/pt-logo-6.png rename to static/client.old/img/_del-temp/pt-logo-6.png diff --git a/static/client/img/_del-temp/request-catalog.png b/static/client.old/img/_del-temp/request-catalog.png similarity index 100% rename from static/client/img/_del-temp/request-catalog.png rename to static/client.old/img/_del-temp/request-catalog.png diff --git a/static/client/img/_del-temp/request-participation.png b/static/client.old/img/_del-temp/request-participation.png similarity index 100% rename from static/client/img/_del-temp/request-participation.png rename to static/client.old/img/_del-temp/request-participation.png diff --git a/static/client/img/_del-temp/request-remotely.png b/static/client.old/img/_del-temp/request-remotely.png similarity index 100% rename from static/client/img/_del-temp/request-remotely.png rename to static/client.old/img/_del-temp/request-remotely.png diff --git a/static/client/img/_del-temp/request-tickets.png b/static/client.old/img/_del-temp/request-tickets.png similarity index 100% rename from static/client/img/_del-temp/request-tickets.png rename to static/client.old/img/_del-temp/request-tickets.png diff --git a/static/client/img/_del-temp/request-tour.png b/static/client.old/img/_del-temp/request-tour.png similarity index 100% rename from static/client/img/_del-temp/request-tour.png rename to static/client.old/img/_del-temp/request-tour.png diff --git a/static/client/img/_del-temp/request-translator.png b/static/client.old/img/_del-temp/request-translator.png similarity index 100% rename from static/client/img/_del-temp/request-translator.png rename to static/client.old/img/_del-temp/request-translator.png diff --git a/static/client/img/_del-temp/review-1.jpg b/static/client.old/img/_del-temp/review-1.jpg similarity index 100% rename from static/client/img/_del-temp/review-1.jpg rename to static/client.old/img/_del-temp/review-1.jpg diff --git a/static/client/img/_del-temp/review-2.jpg b/static/client.old/img/_del-temp/review-2.jpg similarity index 100% rename from static/client/img/_del-temp/review-2.jpg rename to static/client.old/img/_del-temp/review-2.jpg diff --git a/static/client/img/_del-temp/s-map.jpg b/static/client.old/img/_del-temp/s-map.jpg similarity index 100% rename from static/client/img/_del-temp/s-map.jpg rename to static/client.old/img/_del-temp/s-map.jpg diff --git a/static/client/img/_del-temp/usr-1.jpg b/static/client.old/img/_del-temp/usr-1.jpg similarity index 100% rename from static/client/img/_del-temp/usr-1.jpg rename to static/client.old/img/_del-temp/usr-1.jpg diff --git a/static/client/img/_del-temp/usr-2.jpg b/static/client.old/img/_del-temp/usr-2.jpg similarity index 100% rename from static/client/img/_del-temp/usr-2.jpg rename to static/client.old/img/_del-temp/usr-2.jpg diff --git a/static/client/img/_del-temp/video.jpg b/static/client.old/img/_del-temp/video.jpg similarity index 100% rename from static/client/img/_del-temp/video.jpg rename to static/client.old/img/_del-temp/video.jpg diff --git a/static/client/img/_del-temp/vk-widget.jpg b/static/client.old/img/_del-temp/vk-widget.jpg similarity index 100% rename from static/client/img/_del-temp/vk-widget.jpg rename to static/client.old/img/_del-temp/vk-widget.jpg diff --git a/static/client/img/_del-temp/yad.jpg b/static/client.old/img/_del-temp/yad.jpg similarity index 100% rename from static/client/img/_del-temp/yad.jpg rename to static/client.old/img/_del-temp/yad.jpg diff --git a/static/client/img/about_pic.png b/static/client.old/img/about_pic.png similarity index 100% rename from static/client/img/about_pic.png rename to static/client.old/img/about_pic.png diff --git a/static/client/img/ad-themes/Thumbs.db b/static/client.old/img/ad-themes/Thumbs.db similarity index 100% rename from static/client/img/ad-themes/Thumbs.db rename to static/client.old/img/ad-themes/Thumbs.db diff --git a/static/client/img/ad-themes/adt-1.png b/static/client.old/img/ad-themes/adt-1.png similarity index 100% rename from static/client/img/ad-themes/adt-1.png rename to static/client.old/img/ad-themes/adt-1.png diff --git a/static/client/img/ad-themes/adt-2.png b/static/client.old/img/ad-themes/adt-2.png similarity index 100% rename from static/client/img/ad-themes/adt-2.png rename to static/client.old/img/ad-themes/adt-2.png diff --git a/static/client/img/ad-themes/adt-3.png b/static/client.old/img/ad-themes/adt-3.png similarity index 100% rename from static/client/img/ad-themes/adt-3.png rename to static/client.old/img/ad-themes/adt-3.png diff --git a/static/client/img/add_link_text.png b/static/client.old/img/add_link_text.png similarity index 100% rename from static/client/img/add_link_text.png rename to static/client.old/img/add_link_text.png diff --git a/static/client/img/add_pic_block_bg.png b/static/client.old/img/add_pic_block_bg.png similarity index 100% rename from static/client/img/add_pic_block_bg.png rename to static/client.old/img/add_pic_block_bg.png diff --git a/static/client/img/add_pic_block_bg1.png b/static/client.old/img/add_pic_block_bg1.png similarity index 100% rename from static/client/img/add_pic_block_bg1.png rename to static/client.old/img/add_pic_block_bg1.png diff --git a/static/client/img/add_pic_block_bg2.png b/static/client.old/img/add_pic_block_bg2.png similarity index 100% rename from static/client/img/add_pic_block_bg2.png rename to static/client.old/img/add_pic_block_bg2.png diff --git a/static/client/img/ag-bg.png b/static/client.old/img/ag-bg.png similarity index 100% rename from static/client/img/ag-bg.png rename to static/client.old/img/ag-bg.png diff --git a/static/client/img/approved-logo.png b/static/client.old/img/approved-logo.png similarity index 100% rename from static/client/img/approved-logo.png rename to static/client.old/img/approved-logo.png diff --git a/static/client/img/blog_pic.jpg b/static/client.old/img/blog_pic.jpg similarity index 100% rename from static/client/img/blog_pic.jpg rename to static/client.old/img/blog_pic.jpg diff --git a/static/client/img/blog_pic1.jpg b/static/client.old/img/blog_pic1.jpg similarity index 100% rename from static/client/img/blog_pic1.jpg rename to static/client.old/img/blog_pic1.jpg diff --git a/static/client/img/blog_pic2.jpg b/static/client.old/img/blog_pic2.jpg similarity index 100% rename from static/client/img/blog_pic2.jpg rename to static/client.old/img/blog_pic2.jpg diff --git a/static/client/img/clock.png b/static/client.old/img/clock.png similarity index 100% rename from static/client/img/clock.png rename to static/client.old/img/clock.png diff --git a/static/client/img/fancybox/Thumbs.db b/static/client.old/img/fancybox/Thumbs.db similarity index 100% rename from static/client/img/fancybox/Thumbs.db rename to static/client.old/img/fancybox/Thumbs.db diff --git a/static/client/img/fancybox/blank.gif b/static/client.old/img/fancybox/blank.gif similarity index 100% rename from static/client/img/fancybox/blank.gif rename to static/client.old/img/fancybox/blank.gif diff --git a/static/client/img/fancybox/fancybox_loading.gif b/static/client.old/img/fancybox/fancybox_loading.gif similarity index 100% rename from static/client/img/fancybox/fancybox_loading.gif rename to static/client.old/img/fancybox/fancybox_loading.gif diff --git a/static/client/img/fancybox/fancybox_loading@2x.gif b/static/client.old/img/fancybox/fancybox_loading@2x.gif similarity index 100% rename from static/client/img/fancybox/fancybox_loading@2x.gif rename to static/client.old/img/fancybox/fancybox_loading@2x.gif diff --git a/static/client/img/fancybox/fancybox_overlay.png b/static/client.old/img/fancybox/fancybox_overlay.png similarity index 100% rename from static/client/img/fancybox/fancybox_overlay.png rename to static/client.old/img/fancybox/fancybox_overlay.png diff --git a/static/client/img/fancybox/fancybox_sprite.png b/static/client.old/img/fancybox/fancybox_sprite.png similarity index 100% rename from static/client/img/fancybox/fancybox_sprite.png rename to static/client.old/img/fancybox/fancybox_sprite.png diff --git a/static/client/img/fancybox/fancybox_sprite@2x.png b/static/client.old/img/fancybox/fancybox_sprite@2x.png similarity index 100% rename from static/client/img/fancybox/fancybox_sprite@2x.png rename to static/client.old/img/fancybox/fancybox_sprite@2x.png diff --git a/static/client/img/favicon.ico b/static/client.old/img/favicon.ico similarity index 100% rename from static/client/img/favicon.ico rename to static/client.old/img/favicon.ico diff --git a/static/client/img/female.png b/static/client.old/img/female.png similarity index 100% rename from static/client/img/female.png rename to static/client.old/img/female.png diff --git a/static/client/img/libk_bg.png b/static/client.old/img/libk_bg.png similarity index 100% rename from static/client/img/libk_bg.png rename to static/client.old/img/libk_bg.png diff --git a/static/client/img/logo.png b/static/client.old/img/logo.png similarity index 100% rename from static/client/img/logo.png rename to static/client.old/img/logo.png diff --git a/static/client/img/mail-logo-2.jpg b/static/client.old/img/mail-logo-2.jpg similarity index 100% rename from static/client/img/mail-logo-2.jpg rename to static/client.old/img/mail-logo-2.jpg diff --git a/static/client/img/male.png b/static/client.old/img/male.png similarity index 100% rename from static/client/img/male.png rename to static/client.old/img/male.png diff --git a/static/client/img/map.png b/static/client.old/img/map.png similarity index 100% rename from static/client/img/map.png rename to static/client.old/img/map.png diff --git a/static/client/img/no-logo.jpg b/static/client.old/img/no-logo.jpg similarity index 100% rename from static/client/img/no-logo.jpg rename to static/client.old/img/no-logo.jpg diff --git a/static/client/img/no-logo.png b/static/client.old/img/no-logo.png similarity index 100% rename from static/client/img/no-logo.png rename to static/client.old/img/no-logo.png diff --git a/static/client/img/partners/Thumbs.db b/static/client.old/img/partners/Thumbs.db similarity index 100% rename from static/client/img/partners/Thumbs.db rename to static/client.old/img/partners/Thumbs.db diff --git a/static/client/img/partners/deutsche-messe.png b/static/client.old/img/partners/deutsche-messe.png similarity index 100% rename from static/client/img/partners/deutsche-messe.png rename to static/client.old/img/partners/deutsche-messe.png diff --git a/static/client/img/partners/expocentr.png b/static/client.old/img/partners/expocentr.png similarity index 100% rename from static/client/img/partners/expocentr.png rename to static/client.old/img/partners/expocentr.png diff --git a/static/client/img/partners/expoforum.png b/static/client.old/img/partners/expoforum.png similarity index 100% rename from static/client/img/partners/expoforum.png rename to static/client.old/img/partners/expoforum.png diff --git a/static/client/img/partners/ite.png b/static/client.old/img/partners/ite.png similarity index 100% rename from static/client/img/partners/ite.png rename to static/client.old/img/partners/ite.png diff --git a/static/client/img/partners/messe-frankfurt.png b/static/client.old/img/partners/messe-frankfurt.png similarity index 100% rename from static/client/img/partners/messe-frankfurt.png rename to static/client.old/img/partners/messe-frankfurt.png diff --git a/static/client/img/pic1.jpg b/static/client.old/img/pic1.jpg similarity index 100% rename from static/client/img/pic1.jpg rename to static/client.old/img/pic1.jpg diff --git a/static/client/img/pic10.jpg b/static/client.old/img/pic10.jpg similarity index 100% rename from static/client/img/pic10.jpg rename to static/client.old/img/pic10.jpg diff --git a/static/client/img/pic11.jpg b/static/client.old/img/pic11.jpg similarity index 100% rename from static/client/img/pic11.jpg rename to static/client.old/img/pic11.jpg diff --git a/static/client/img/pic12.png b/static/client.old/img/pic12.png similarity index 100% rename from static/client/img/pic12.png rename to static/client.old/img/pic12.png diff --git a/static/client/img/pic13.jpg b/static/client.old/img/pic13.jpg similarity index 100% rename from static/client/img/pic13.jpg rename to static/client.old/img/pic13.jpg diff --git a/static/client/img/pic14.jpg b/static/client.old/img/pic14.jpg similarity index 100% rename from static/client/img/pic14.jpg rename to static/client.old/img/pic14.jpg diff --git a/static/client/img/pic15.jpg b/static/client.old/img/pic15.jpg similarity index 100% rename from static/client/img/pic15.jpg rename to static/client.old/img/pic15.jpg diff --git a/static/client/img/pic16.jpg b/static/client.old/img/pic16.jpg similarity index 100% rename from static/client/img/pic16.jpg rename to static/client.old/img/pic16.jpg diff --git a/static/client/img/pic2.jpg b/static/client.old/img/pic2.jpg similarity index 100% rename from static/client/img/pic2.jpg rename to static/client.old/img/pic2.jpg diff --git a/static/client/img/pic3.jpg b/static/client.old/img/pic3.jpg similarity index 100% rename from static/client/img/pic3.jpg rename to static/client.old/img/pic3.jpg diff --git a/static/client/img/pic4.jpg b/static/client.old/img/pic4.jpg similarity index 100% rename from static/client/img/pic4.jpg rename to static/client.old/img/pic4.jpg diff --git a/static/client/img/pic5.jpg b/static/client.old/img/pic5.jpg similarity index 100% rename from static/client/img/pic5.jpg rename to static/client.old/img/pic5.jpg diff --git a/static/client/img/pic6.jpg b/static/client.old/img/pic6.jpg similarity index 100% rename from static/client/img/pic6.jpg rename to static/client.old/img/pic6.jpg diff --git a/static/client/img/pic7.jpg b/static/client.old/img/pic7.jpg similarity index 100% rename from static/client/img/pic7.jpg rename to static/client.old/img/pic7.jpg diff --git a/static/client/img/pic8.jpg b/static/client.old/img/pic8.jpg similarity index 100% rename from static/client/img/pic8.jpg rename to static/client.old/img/pic8.jpg diff --git a/static/client/img/pic8.png b/static/client.old/img/pic8.png similarity index 100% rename from static/client/img/pic8.png rename to static/client.old/img/pic8.png diff --git a/static/client/img/pic9.jpg b/static/client.old/img/pic9.jpg similarity index 100% rename from static/client/img/pic9.jpg rename to static/client.old/img/pic9.jpg diff --git a/static/client/img/pin.png b/static/client.old/img/pin.png similarity index 100% rename from static/client/img/pin.png rename to static/client.old/img/pin.png diff --git a/static/client/img/search-bg.jpg b/static/client.old/img/search-bg.jpg similarity index 100% rename from static/client/img/search-bg.jpg rename to static/client.old/img/search-bg.jpg diff --git a/static/client/img/select.png b/static/client.old/img/select.png similarity index 100% rename from static/client/img/select.png rename to static/client.old/img/select.png diff --git a/static/client/img/semitransparent-ie8.png b/static/client.old/img/semitransparent-ie8.png similarity index 100% rename from static/client/img/semitransparent-ie8.png rename to static/client.old/img/semitransparent-ie8.png diff --git a/static/client/img/signature.png b/static/client.old/img/signature.png similarity index 100% rename from static/client/img/signature.png rename to static/client.old/img/signature.png diff --git a/static/client/img/soc-medias/Thumbs.db b/static/client.old/img/soc-medias/Thumbs.db similarity index 100% rename from static/client/img/soc-medias/Thumbs.db rename to static/client.old/img/soc-medias/Thumbs.db diff --git a/static/client/img/soc-medias/icon-fb.png b/static/client.old/img/soc-medias/icon-fb.png similarity index 100% rename from static/client/img/soc-medias/icon-fb.png rename to static/client.old/img/soc-medias/icon-fb.png diff --git a/static/client/img/soc-medias/icon-fb_hover.png b/static/client.old/img/soc-medias/icon-fb_hover.png similarity index 100% rename from static/client/img/soc-medias/icon-fb_hover.png rename to static/client.old/img/soc-medias/icon-fb_hover.png diff --git a/static/client/img/soc-medias/icon-goog.png b/static/client.old/img/soc-medias/icon-goog.png similarity index 100% rename from static/client/img/soc-medias/icon-goog.png rename to static/client.old/img/soc-medias/icon-goog.png diff --git a/static/client/img/soc-medias/icon-lin.png b/static/client.old/img/soc-medias/icon-lin.png similarity index 100% rename from static/client/img/soc-medias/icon-lin.png rename to static/client.old/img/soc-medias/icon-lin.png diff --git a/static/client/img/soc-medias/icon-lin_hover.png b/static/client.old/img/soc-medias/icon-lin_hover.png similarity index 100% rename from static/client/img/soc-medias/icon-lin_hover.png rename to static/client.old/img/soc-medias/icon-lin_hover.png diff --git a/static/client/img/soc-medias/icon-mailr.png b/static/client.old/img/soc-medias/icon-mailr.png similarity index 100% rename from static/client/img/soc-medias/icon-mailr.png rename to static/client.old/img/soc-medias/icon-mailr.png diff --git a/static/client/img/soc-medias/icon-ok.png b/static/client.old/img/soc-medias/icon-ok.png similarity index 100% rename from static/client/img/soc-medias/icon-ok.png rename to static/client.old/img/soc-medias/icon-ok.png diff --git a/static/client/img/soc-medias/icon-twit.png b/static/client.old/img/soc-medias/icon-twit.png similarity index 100% rename from static/client/img/soc-medias/icon-twit.png rename to static/client.old/img/soc-medias/icon-twit.png diff --git a/static/client/img/soc-medias/icon-vk.png b/static/client.old/img/soc-medias/icon-vk.png similarity index 100% rename from static/client/img/soc-medias/icon-vk.png rename to static/client.old/img/soc-medias/icon-vk.png diff --git a/static/client/img/soc-medias/icon-yand.png b/static/client.old/img/soc-medias/icon-yand.png similarity index 100% rename from static/client/img/soc-medias/icon-yand.png rename to static/client.old/img/soc-medias/icon-yand.png diff --git a/static/client/img/soc-medias/sm-icon-fb-w.png b/static/client.old/img/soc-medias/sm-icon-fb-w.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-fb-w.png rename to static/client.old/img/soc-medias/sm-icon-fb-w.png diff --git a/static/client/img/soc-medias/sm-icon-fb.png b/static/client.old/img/soc-medias/sm-icon-fb.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-fb.png rename to static/client.old/img/soc-medias/sm-icon-fb.png diff --git a/static/client/img/soc-medias/sm-icon-lin-w.png b/static/client.old/img/soc-medias/sm-icon-lin-w.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-lin-w.png rename to static/client.old/img/soc-medias/sm-icon-lin-w.png diff --git a/static/client/img/soc-medias/sm-icon-lin.png b/static/client.old/img/soc-medias/sm-icon-lin.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-lin.png rename to static/client.old/img/soc-medias/sm-icon-lin.png diff --git a/static/client/img/soc-medias/sm-icon-rss.png b/static/client.old/img/soc-medias/sm-icon-rss.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-rss.png rename to static/client.old/img/soc-medias/sm-icon-rss.png diff --git a/static/client/img/soc-medias/sm-icon-twit-w.png b/static/client.old/img/soc-medias/sm-icon-twit-w.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-twit-w.png rename to static/client.old/img/soc-medias/sm-icon-twit-w.png diff --git a/static/client/img/soc-medias/sm-icon-twit.png b/static/client.old/img/soc-medias/sm-icon-twit.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-twit.png rename to static/client.old/img/soc-medias/sm-icon-twit.png diff --git a/static/client/img/soc-medias/sm-icon-twit_hover.png b/static/client.old/img/soc-medias/sm-icon-twit_hover.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-twit_hover.png rename to static/client.old/img/soc-medias/sm-icon-twit_hover.png diff --git a/static/client/img/soc-medias/sm-icon-vk-w.png b/static/client.old/img/soc-medias/sm-icon-vk-w.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-vk-w.png rename to static/client.old/img/soc-medias/sm-icon-vk-w.png diff --git a/static/client/img/soc-medias/sm-icon-vk.png b/static/client.old/img/soc-medias/sm-icon-vk.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-vk.png rename to static/client.old/img/soc-medias/sm-icon-vk.png diff --git a/static/client/img/soc-medias/sm-icon-vk_hover.png b/static/client.old/img/soc-medias/sm-icon-vk_hover.png similarity index 100% rename from static/client/img/soc-medias/sm-icon-vk_hover.png rename to static/client.old/img/soc-medias/sm-icon-vk_hover.png diff --git a/static/client/img/soc.png b/static/client.old/img/soc.png similarity index 100% rename from static/client/img/soc.png rename to static/client.old/img/soc.png diff --git a/static/client/img/space.png b/static/client.old/img/space.png similarity index 100% rename from static/client/img/space.png rename to static/client.old/img/space.png diff --git a/static/client/img/spacer.gif b/static/client.old/img/spacer.gif similarity index 100% rename from static/client/img/spacer.gif rename to static/client.old/img/spacer.gif diff --git a/static/client/img/sprites.png b/static/client.old/img/sprites.png similarity index 100% rename from static/client/img/sprites.png rename to static/client.old/img/sprites.png diff --git a/static/client/img/subjects_list.png b/static/client.old/img/subjects_list.png similarity index 100% rename from static/client/img/subjects_list.png rename to static/client.old/img/subjects_list.png diff --git a/static/client/img/themes/Thumbs.db b/static/client.old/img/themes/Thumbs.db similarity index 100% rename from static/client/img/themes/Thumbs.db rename to static/client.old/img/themes/Thumbs.db diff --git a/static/client/img/themes/expo-1.png b/static/client.old/img/themes/expo-1.png similarity index 100% rename from static/client/img/themes/expo-1.png rename to static/client.old/img/themes/expo-1.png diff --git a/static/client/img/themes/expo-2.png b/static/client.old/img/themes/expo-2.png similarity index 100% rename from static/client/img/themes/expo-2.png rename to static/client.old/img/themes/expo-2.png diff --git a/static/client/img/themes/expo-3.png b/static/client.old/img/themes/expo-3.png similarity index 100% rename from static/client/img/themes/expo-3.png rename to static/client.old/img/themes/expo-3.png diff --git a/static/client/img/wait.gif b/static/client.old/img/wait.gif similarity index 100% rename from static/client/img/wait.gif rename to static/client.old/img/wait.gif diff --git a/static/client/img/wether.png b/static/client.old/img/wether.png similarity index 100% rename from static/client/img/wether.png rename to static/client.old/img/wether.png diff --git a/static/client/img/x2.png b/static/client.old/img/x2.png similarity index 100% rename from static/client/img/x2.png rename to static/client.old/img/x2.png diff --git a/static/client/js/existing-tags.js b/static/client.old/js/existing-tags.js similarity index 100% rename from static/client/js/existing-tags.js rename to static/client.old/js/existing-tags.js diff --git a/static/client/js/gmap.js b/static/client.old/js/gmap.js similarity index 100% rename from static/client/js/gmap.js rename to static/client.old/js/gmap.js diff --git a/static/client/js/idangerous.swiper-2.4.min.js b/static/client.old/js/idangerous.swiper-2.4.min.js similarity index 100% rename from static/client/js/idangerous.swiper-2.4.min.js rename to static/client.old/js/idangerous.swiper-2.4.min.js diff --git a/static/client/js/jquery-ui-1.10.3.custom.min.js b/static/client.old/js/jquery-ui-1.10.3.custom.min.js similarity index 100% rename from static/client/js/jquery-ui-1.10.3.custom.min.js rename to static/client.old/js/jquery-ui-1.10.3.custom.min.js diff --git a/static/client/js/jquery-ui-1.10.4.custom.min.js b/static/client.old/js/jquery-ui-1.10.4.custom.min.js similarity index 100% rename from static/client/js/jquery-ui-1.10.4.custom.min.js rename to static/client.old/js/jquery-ui-1.10.4.custom.min.js diff --git a/static/client/js/jquery.fancybox.pack.js b/static/client.old/js/jquery.fancybox.pack.js similarity index 100% rename from static/client/js/jquery.fancybox.pack.js rename to static/client.old/js/jquery.fancybox.pack.js diff --git a/static/client/js/jquery.mCustomScrollbar.min.js b/static/client.old/js/jquery.mCustomScrollbar.min.js similarity index 100% rename from static/client/js/jquery.mCustomScrollbar.min.js rename to static/client.old/js/jquery.mCustomScrollbar.min.js diff --git a/static/client/js/jquery.mousewheel.min.js b/static/client.old/js/jquery.mousewheel.min.js similarity index 100% rename from static/client/js/jquery.mousewheel.min.js rename to static/client.old/js/jquery.mousewheel.min.js diff --git a/static/client/js/jquery.phototag.js b/static/client.old/js/jquery.phototag.js similarity index 100% rename from static/client/js/jquery.phototag.js rename to static/client.old/js/jquery.phototag.js diff --git a/static/client/js/jquery.placeholder.js b/static/client.old/js/jquery.placeholder.js similarity index 100% rename from static/client/js/jquery.placeholder.js rename to static/client.old/js/jquery.placeholder.js diff --git a/static/client/js/jquery.ui.datepicker-ru.js b/static/client.old/js/jquery.ui.datepicker-ru.js similarity index 100% rename from static/client/js/jquery.ui.datepicker-ru.js rename to static/client.old/js/jquery.ui.datepicker-ru.js diff --git a/static/client/js/main.js b/static/client.old/js/main.js similarity index 100% rename from static/client/js/main.js rename to static/client.old/js/main.js diff --git a/static/client/js/pages/complete_registration.js b/static/client.old/js/pages/complete_registration.js similarity index 100% rename from static/client/js/pages/complete_registration.js rename to static/client.old/js/pages/complete_registration.js diff --git a/static/client/js/pages/profile.js b/static/client.old/js/pages/profile.js similarity index 100% rename from static/client/js/pages/profile.js rename to static/client.old/js/pages/profile.js diff --git a/static/client/js/pages/profile_company.js b/static/client.old/js/pages/profile_company.js similarity index 100% rename from static/client/js/pages/profile_company.js rename to static/client.old/js/pages/profile_company.js diff --git a/static/client/js/plugins.js b/static/client.old/js/plugins.js similarity index 100% rename from static/client/js/plugins.js rename to static/client.old/js/plugins.js diff --git a/static/client/js/plugins/select2.min.js b/static/client.old/js/plugins/select2.min.js similarity index 100% rename from static/client/js/plugins/select2.min.js rename to static/client.old/js/plugins/select2.min.js diff --git a/static/client/js/plugins/select2_locale_ru.js b/static/client.old/js/plugins/select2_locale_ru.js similarity index 100% rename from static/client/js/plugins/select2_locale_ru.js rename to static/client.old/js/plugins/select2_locale_ru.js diff --git a/static/client/js/regions.js b/static/client.old/js/regions.js similarity index 100% rename from static/client/js/regions.js rename to static/client.old/js/regions.js diff --git a/static/client/js/scripts.js b/static/client.old/js/scripts.js similarity index 100% rename from static/client/js/scripts.js rename to static/client.old/js/scripts.js diff --git a/static/client/js/selectivizr-min.js b/static/client.old/js/selectivizr-min.js similarity index 100% rename from static/client/js/selectivizr-min.js rename to static/client.old/js/selectivizr-min.js diff --git a/static/client/js/sendfilter.js b/static/client.old/js/sendfilter.js similarity index 100% rename from static/client/js/sendfilter.js rename to static/client.old/js/sendfilter.js diff --git a/static/client/js/vendor/jquery-1.10.1.min.js b/static/client.old/js/vendor/jquery-1.10.1.min.js similarity index 100% rename from static/client/js/vendor/jquery-1.10.1.min.js rename to static/client.old/js/vendor/jquery-1.10.1.min.js diff --git a/static/client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js b/static/client.old/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js similarity index 100% rename from static/client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js rename to static/client.old/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js diff --git a/templates/admin/accounts/user_all.html b/templates/admin/accounts/user_all.html index 6c6accdb..cccdd7d7 100644 --- a/templates/admin/accounts/user_all.html +++ b/templates/admin/accounts/user_all.html @@ -50,17 +50,7 @@ {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/base.html b/templates/admin/base.html index f8d573ce..203460af 100644 --- a/templates/admin/base.html +++ b/templates/admin/base.html @@ -45,6 +45,8 @@ #navigation{ margin-top: 10px; } + {% block styles %} + {% endblock %} diff --git a/templates/admin/city/city_all.html b/templates/admin/city/city_all.html index 9ac0e1c4..c0d015f2 100644 --- a/templates/admin/city/city_all.html +++ b/templates/admin/city/city_all.html @@ -44,17 +44,7 @@ Displays lists of all cities in the table Добавить город - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/company/company_all.html b/templates/admin/company/company_all.html index 4e63b2b9..8ee26a81 100644 --- a/templates/admin/company/company_all.html +++ b/templates/admin/company/company_all.html @@ -44,17 +44,7 @@ Displays lists of all companies in the table Добавить компанию {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/conference/conference_all.html b/templates/admin/conference/conference_all.html index d019a312..43e458d9 100644 --- a/templates/admin/conference/conference_all.html +++ b/templates/admin/conference/conference_all.html @@ -70,16 +70,6 @@ Добавить конференцию {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/country/country_all.html b/templates/admin/country/country_all.html index 81beb37d..d6a593a0 100644 --- a/templates/admin/country/country_all.html +++ b/templates/admin/country/country_all.html @@ -46,37 +46,8 @@ Displays lists of all countries in the table Добавить страну - - +{% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} diff --git a/templates/admin/exposition/exposition_all.html b/templates/admin/exposition/exposition_all.html index 4ada2d5a..869103f8 100644 --- a/templates/admin/exposition/exposition_all.html +++ b/templates/admin/exposition/exposition_all.html @@ -4,6 +4,15 @@ +{% endblock %} +{% block styles %} + +td a{ + float:left; + margin: 0 10px 10px 0 +} + + {% endblock %} @@ -32,7 +41,7 @@ {{ item.name }} {{ item.data_begin }} - + Отключить @@ -41,23 +50,17 @@ href="/admin/exposition/switch/{{ item.url }}/on"> Включить - - Изменить - - - + Копировать - - - - + Удалить - + + @@ -67,16 +70,6 @@ Добавить выставку {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/includes/admin_pagination.html b/templates/admin/includes/admin_pagination.html new file mode 100644 index 00000000..91daa80d --- /dev/null +++ b/templates/admin/includes/admin_pagination.html @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/templates/admin/organiser/organiser_all.html b/templates/admin/organiser/organiser_all.html index b4738b0e..f005505b 100644 --- a/templates/admin/organiser/organiser_all.html +++ b/templates/admin/organiser/organiser_all.html @@ -43,17 +43,7 @@ Displays lists of all organisers in the table Добавить организатора {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/photogallery/admin_gallery_list.html b/templates/admin/photogallery/admin_gallery_list.html index c8defc5f..0243e0b4 100644 --- a/templates/admin/photogallery/admin_gallery_list.html +++ b/templates/admin/photogallery/admin_gallery_list.html @@ -40,8 +40,9 @@ - Добавить фото + Добавить галерею + {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/photogallery/admin_photo_list.html b/templates/admin/photogallery/admin_photo_list.html index 4ed25a42..6cfc93c7 100644 --- a/templates/admin/photogallery/admin_photo_list.html +++ b/templates/admin/photogallery/admin_photo_list.html @@ -47,5 +47,6 @@ Добавить фото + {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/place_conference/place_conference_all.html b/templates/admin/place_conference/place_conference_all.html index 9410f79e..6c71e2e2 100644 --- a/templates/admin/place_conference/place_conference_all.html +++ b/templates/admin/place_conference/place_conference_all.html @@ -15,7 +15,6 @@ Название - Краткое описание Страна Город   @@ -25,7 +24,6 @@ {% for item in objects %} {{ item.name }} - {% ifnotequal item.type None %}{{ item.type }} {% endifnotequal %} {% ifnotequal item.country None %}{{ item.country }} {% endifnotequal %} {% ifnotequal item.city None %}{{ item.city }} {% endifnotequal %} @@ -50,17 +48,7 @@ Добавить конферец зал {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} diff --git a/templates/admin/place_exposition/place_exposition.html b/templates/admin/place_exposition/place_exposition.html new file mode 100644 index 00000000..229ffb0f --- /dev/null +++ b/templates/admin/place_exposition/place_exposition.html @@ -0,0 +1,476 @@ +{% extends 'base.html' %} +{% load static %} + +{% block scripts %} + + + {# google map не забыть скачать скрипты на локал #} + + + + + {# selects #} + + + + + {# ajax #} + + + +{% endblock %} + +{% block body %} + +
{% csrf_token %} +
+ {% if object %} Изменить {% else %} Добавить {% endif %}выставочный центр + +
+
+

Основная информация

+
+
+ {# Hidden input uses for comparing with TmpFile objects #} + {{ form.key }} + {# Hidden input uses in clean method for checking url #} + {{ form.place_exposition_id }} + + {# name #} + {% with field='name' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# type #} +
+ +
{{ form.type}} + {{ form.type.errors }} +
+
+ {# main_title #} + {% with field='main_title' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# country #} +
+ +
{{ form.country}} + {{ form.country.errors }} +
+
+ {# city #} +
+ +
{{ form.city}} + {{ form.city.errors }} +
+
+ +
+
+ +
+
+

Дополнительная информация

+
+
+ {# description #} + {% with field='description' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# adress #} + {% with field='adress' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# address #} +
+ +
{{ form.address }} + {{ form.address.errors }} +
+
+ + {# phone #} +
+ +
{{ form.phone}} + {{ form.phone.errors }} +
+
+ {# fax #} +
+ +
{{ form.fax}} + {{ form.fax.errors }} +
+
+ {# web_page #} +
+ +
{{ form.web_page}} + {{ form.web_page.errors }} +
+
+ {# email #} +
+ +
{{ form.email}} + {{ form.email.errors }} +
+
+ {# video_link #} +
+ +
{{ form.video_link }} + {{ form.video_link.errors }} +
+
+ +
+
+
+
+

Основная информация

+
+
+ {# foundation_year #} +
+ +
{{ form.foundation_year}} + {{ form.foundation_year.errors }} +
+
+ {# total_year_action #} + {% with field='total_year_action' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# total_area #} +
+ +
{{ form.total_area}} + {{ form.total_area.errors }} +
+
+ {# closed_area #} +
+ +
{{ form.closed_area}} + {{ form.closed_area.errors }} +
+
+ {# open_area #} +
+ +
{{ form.open_area}} + {{ form.open_area.errors }} +
+
+ {# total_pavilions #} +
+ +
{{ form.total_pavilions}} + {{ form.total_pavilions.errors }} +
+
+ {# total_halls #} +
+ +
{{ form.total_halls}} + {{ form.total_halls.errors }} +
+
+
+
+ +
+
+

Вместимость павилионов

+
+
+ + + {% if formset.errors %} +
+ {% for form in formset.forms %} + + {% for key, value in form.errors.items %} +

{{ value }}

+ {% endfor %} + + {% endfor %} +
+ {% endif %} + {# formset of halls #} + {{ formset.management_form }} + + +
+ + + + + + + + + + + + {% for form in formset.forms %} + + + + + + + + + {% endfor %} + +
Название павилионаНомерВместимость
{{ form.name }}{{ form.number }}{{ form.capacity }} Удалить
+
+

Добавить зал

+
+
+ +
+
+

Услуги

+
+
+
+ {# wifi #} +
+ +
{{ form.wifi}} + {{ form.wifi.errors }} +
+
+ {# bank #} +
+ +
{{ form.bank}} + {{ form.bank.errors }} +
+
+ {# children_room #} +
+ +
{{ form.children_room}} + {{ form.children_room.errors }} +
+
+ {# disabled_service #} +
+ +
{{ form.disabled_service}} + {{ form.disabled_service.errors }} +
+
+ {# conference_centre #} +
+ +
{{ form.conference_centre}} + {{ form.conference_centre.errors }} +
+
+ {# business_centre #} +
+ +
{{ form.business_centre}} + {{ form.business_centre.errors }} +
+
+
+
+ {# online_registration #} +
+ +
{{ form.online_registration}} + {{ form.online_registration.errors }} +
+
+ {# cafe #} +
+ +
{{ form.cafe}} + {{ form.cafe.errors }} +
+
+ {# terminals #} +
+ +
{{ form.terminals}} + {{ form.terminals.errors }} +
+
+ {# parking #} +
+ +
{{ form.parking}} + {{ form.parking.errors }} +
+
+ {# press_centre #} +
+ +
{{ form.press_centre}} + {{ form.press_centre.errors }} +
+
+ {# mobile_application #} +
+ +
{{ form.mobile_application}} + {{ form.mobile_application.errors }} +
+
+
+ +
+
+ +
+
+

Файлы

+
+
+ {# button that shows modal window with file form #} + Добавить файл + {# this div shows list of files and refreshes when new file added #} +
+ + + + + + + + + + + + + {% for file in files %} + + + + + + + + + + {% endfor %} + +
idФайлИмяНазначение
{{ file.id }}{{ file.file_name }}{{ file.purpose }} + +
+
+ +
+
+ +
+
+

Фотогалерея

+
+
+ Просмотреть галерею

+ + {% with photos=object.photogallery.photos.all %} + {% for photo in photos %} +
+ {{ photo.title }} +
+ {% endfor %} + {% endwith %} + +
+
+ +
+
+

Мета даные

+
+
+ + {# keywords #} + {% with field='keywords' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# title #} + {% with field='title' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# descriptions #} + {% with field='descriptions' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + +
+
+ + +
+ + +
+ +
+
+ + {# modal window #} + +{% endblock %} \ No newline at end of file diff --git a/templates/admin/place_exposition/place_exposition_add.html b/templates/admin/place_exposition/place_exposition_add.html index f79db59a..73a2540d 100644 --- a/templates/admin/place_exposition/place_exposition_add.html +++ b/templates/admin/place_exposition/place_exposition_add.html @@ -373,6 +373,24 @@ +
+
+

Фотогалерея

+
+
+ Просмотреть галерею

+ + {% with photos=object.photogallery.photos.all %} + {% for photo in photos %} +
+ {{ photo.title }} +
+ {% endfor %} + {% endwith %} + +
+
+

Мета даные

diff --git a/templates/admin/place_exposition/place_exposition_all.html b/templates/admin/place_exposition/place_exposition_all.html index 7cdf311c..ad1c8f3e 100644 --- a/templates/admin/place_exposition/place_exposition_all.html +++ b/templates/admin/place_exposition/place_exposition_all.html @@ -15,7 +15,6 @@ Название - Краткое описание Страна Город   @@ -25,7 +24,6 @@ {% for item in objects %} {{ item.name }} - {% ifnotequal item.type None %}{{ item.type }} {% endifnotequal %} {% ifnotequal item.country None %}{{ item.country }} {% endifnotequal %} {% ifnotequal item.city None %}{{ item.city }} {% endifnotequal %} @@ -51,17 +49,8 @@ Добавить выставочный центр
{# pagination #} -
{% endblock %} \ No newline at end of file diff --git a/templates/admin/seminar/seminar_all.html b/templates/admin/seminar/seminar_all.html index 0ca03c52..0cf057f2 100644 --- a/templates/admin/seminar/seminar_all.html +++ b/templates/admin/seminar/seminar_all.html @@ -69,16 +69,6 @@ Добавить семинар {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/service/service_all.html b/templates/admin/service/service_all.html index af7e6c8a..6eef2cd1 100644 --- a/templates/admin/service/service_all.html +++ b/templates/admin/service/service_all.html @@ -37,18 +37,7 @@ Добавить услугу - {# pagination #} - {% endblock %} diff --git a/templates/admin/theme/tag_all.html b/templates/admin/theme/tag_all.html index a9ca0849..2d598a02 100644 --- a/templates/admin/theme/tag_all.html +++ b/templates/admin/theme/tag_all.html @@ -54,16 +54,6 @@ Добавить тег {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/theme/theme_all.html b/templates/admin/theme/theme_all.html index 356ddb0c..3a223aa4 100644 --- a/templates/admin/theme/theme_all.html +++ b/templates/admin/theme/theme_all.html @@ -51,16 +51,6 @@ Добавить тематику {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/translator/translator_all.html b/templates/admin/translator/translator_all.html index 31b32209..180e0289 100644 --- a/templates/admin/translator/translator_all.html +++ b/templates/admin/translator/translator_all.html @@ -44,16 +44,6 @@ Добавить перводчика {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/admin/webinar/webinar_all.html b/templates/admin/webinar/webinar_all.html index 0d9ab617..3d7e10a3 100644 --- a/templates/admin/webinar/webinar_all.html +++ b/templates/admin/webinar/webinar_all.html @@ -70,16 +70,6 @@ Добавить вебинар {# pagination #} - + {% include 'admin/includes/admin_pagination.html' with page_obj=objects %} {% endblock %} \ No newline at end of file diff --git a/templates/client/accounts/fill_company.html b/templates/client/accounts/fill_company.html index 8985c166..23ee65d0 100644 --- a/templates/client/accounts/fill_company.html +++ b/templates/client/accounts/fill_company.html @@ -48,7 +48,7 @@ {% else %} {% endif %} - {{ home_form.instance.country }} + {{ home_form.instance.country }} {% if home_form.instance.country and home_form.instance.city %} @@ -56,7 +56,7 @@ {% else %} {% endif %} - , {{ home_form.instance.city }} + , {{ home_form.instance.city }}
@@ -66,7 +66,7 @@ Указать
свой город +5
{% endif %} -
{% csrf_token %} + {% csrf_token %}
@@ -100,16 +100,18 @@
- {{ request.user.company.get_permanent_url }} + + {{ request.user.company.get_permanent_url }} +
- {{ name_form.name.value }} + {{ name_form.name.value }}
редактировать
- {% csrf_token %} + {% csrf_token %}
@@ -137,7 +139,7 @@
{% if spec_form.specialization.value %} - {{ spec_form.specialization.value }} + {{ spec_form.specialization.value }} {% endif %}
{% if spec_form.specialization.value %} @@ -148,7 +150,7 @@ {% endif %}
- {% csrf_token %} + {% csrf_token %}
@@ -181,7 +183,7 @@
{% if address_form.address_inf.value %} - {{ address_form.address_inf.value }} + {{ address_form.address_inf.value }} {% endif %}
@@ -193,7 +195,7 @@ {% endif %}
- {% csrf_token %} + {% csrf_token %}
@@ -243,31 +245,39 @@
+ {% block paginator %} + + {% with page_obj=page_obj queries=queries %} + {% include 'includes/paginator.html' %} + {% endwith %} + + {% endblock %} {% endblock %} {% block photogallery %} @@ -122,4 +131,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/client/popups/period.html b/templates/client/popups/period.html index 9b21c1fd..55464274 100644 --- a/templates/client/popups/period.html +++ b/templates/client/popups/period.html @@ -6,7 +6,7 @@
{% trans 'Период' %}
- +
diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html index c7ae4add..5854015d 100644 --- a/templates/client/popups/place.html +++ b/templates/client/popups/place.html @@ -25,18 +25,28 @@ {% for value, text in search_form.area.field.choices %}
  • - + {{ text }} {% if value|get_country_by_area %}
      {% for country in value|get_country_by_area %}
    • - + {{ country.name }} {% if country.id|get_city_by_country %}
        {% for city in country.id|get_city_by_country %} -
        • +
      • + +
        • {% endfor %}
      @@ -50,6 +60,7 @@ {% endfor %}
    +
    • {% trans 'Быстрый выбор' %}:
    diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html index af4ecf60..e0ae345d 100644 --- a/templates/client/popups/theme.html +++ b/templates/client/popups/theme.html @@ -1,5 +1,6 @@ {% load static %} {% load i18n %} +{% load template_filters %}