Ivan_Home_PC
11 years ago
commit
36caf23343
31 changed files with 1607 additions and 1604 deletions
@ -1,11 +1,19 @@ |
|||||||
# -*- coding: utf-8 -*- |
# -*- coding: utf-8 -*- |
||||||
from django.conf.urls import url, patterns |
from django.conf.urls import url, patterns |
||||||
from .views import CatalogDetailedView, SpecCatalog |
from .views import CatalogDetailedView, SpecCatalog, redirect_old |
||||||
|
|
||||||
|
|
||||||
urlpatterns = patterns('', |
urlpatterns = patterns('', |
||||||
url(r'^city/$', SpecCatalog.as_view(), {'type': 'city'}, name="spec_city"), |
url(r'^city/(?P<city>.*)/all/page/(?P<page>\d+)/$', redirect_old, {'type': 'city'}), |
||||||
url(r'^country/$', SpecCatalog.as_view(), {'type': 'country'}, name="spec_country"), |
url(r'^city/(?P<city>.*)/all/$', redirect_old, {'type': 'city'}), |
||||||
|
url(r'^city/$', SpecCatalog.as_view(), {'type': 'city', 'meta_id': 86}, name="spec_city"), |
||||||
|
url(r'^city/(?P<slug>.*)/$', CatalogDetailedView.as_view(), {'type': 'city', 'meta_id': 88}, name="spec_catalog_city"), |
||||||
|
|
||||||
url(r'^city/(?P<slug>.*)/$', CatalogDetailedView.as_view(), {'type': 'city'}, name="spec_catalog_city"), |
url(r'^country/(?P<country>.*)/all/page/(?P<page>\d+)/$', redirect_old), |
||||||
url(r'^country/(?P<slug>.*)/$', CatalogDetailedView.as_view(), {'type': 'country'}, name="spec_catalog_country"), |
url(r'^country/(?P<country>.*)/all/$', redirect_old), |
||||||
|
url(r'^country/$', SpecCatalog.as_view(), {'type': 'country', 'meta_id': 86}, name="spec_country"), |
||||||
|
url(r'^country/(?P<slug>.*)/$', CatalogDetailedView.as_view(), {'type': 'country', 'meta_id': 87}, name="spec_catalog_country"), |
||||||
|
url(r'^(?P<slug>.*)/$', redirect_old), |
||||||
|
url(r'^page/(?P<page>\d+)/$', redirect_old), |
||||||
|
url(r'^$', redirect_old), |
||||||
) |
) |
||||||
@ -1 +0,0 @@ |
|||||||
/home/www/proj/templates/client/static_client |
|
||||||
@ -0,0 +1 @@ |
|||||||
|
/home/www/proj/templates/client/static_client |
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
@ -1,87 +0,0 @@ |
|||||||
(function () { |
|
||||||
"use strict"; |
|
||||||
|
|
||||||
var API_URL_ROOT = "/expo-b/get-banners/"; |
|
||||||
|
|
||||||
var getUrl = function () { |
|
||||||
var data = window.sendData; |
|
||||||
|
|
||||||
if (data instanceof Object) { |
|
||||||
var search = []; |
|
||||||
|
|
||||||
for (var key in data) { |
|
||||||
if (data.hasOwnProperty(key)) { |
|
||||||
var value = data[key]; |
|
||||||
|
|
||||||
if (value instanceof Array) { |
|
||||||
for (var i = 0, l = value.length; i < l; i++) { |
|
||||||
search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value[i])); |
|
||||||
} |
|
||||||
} else { |
|
||||||
search.push(encodeURIComponent(key) + "=" + encodeURIComponent(value)); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
if (search.length) { |
|
||||||
return API_URL_ROOT + "?" + search.join("&"); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
return API_URL_ROOT; |
|
||||||
}; |
|
||||||
|
|
||||||
var getBanners = function (url, callback) { |
|
||||||
var xhr = new XMLHttpRequest(); |
|
||||||
xhr.open("GET", url, true); |
|
||||||
|
|
||||||
xhr.onreadystatechange = function (event) { |
|
||||||
if (event.target.readyState === 4) { |
|
||||||
if (event.target.status === 200) { |
|
||||||
try { |
|
||||||
callback(JSON.parse(event.target.responseText)); |
|
||||||
} catch (error) { |
|
||||||
// do nothing
|
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
}; |
|
||||||
|
|
||||||
xhr.send(); |
|
||||||
}; |
|
||||||
|
|
||||||
var addBanner = function (banner) { |
|
||||||
var parent = document.getElementById(banner.id); |
|
||||||
|
|
||||||
if (parent) { |
|
||||||
if (banner.is_img) { |
|
||||||
var a = document.createElement("a"); |
|
||||||
a.href = banner.url; |
|
||||||
|
|
||||||
var img = document.createElement("img"); |
|
||||||
img.src = banner.img; |
|
||||||
img.alt = banner.alt; |
|
||||||
|
|
||||||
a.appendChild(img); |
|
||||||
parent.appendChild(a); |
|
||||||
} else if (banner.is_html) { |
|
||||||
parent.innerHTML = banner.text; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
}; |
|
||||||
|
|
||||||
var insertBanners = function (data) { |
|
||||||
if (data instanceof Array) { |
|
||||||
for (var i = 0, l = data.length; i < l; i++) { |
|
||||||
addBanner(data[i]); |
|
||||||
} |
|
||||||
} |
|
||||||
}; |
|
||||||
|
|
||||||
var main = function () { |
|
||||||
getBanners(getUrl(), insertBanners); |
|
||||||
}; |
|
||||||
|
|
||||||
window.addEventListener("load", main); |
|
||||||
})(); |
|
||||||
File diff suppressed because one or more lines are too long
@ -1 +1 @@ |
|||||||
var EXPO=EXPO||{};EXPO.newsFilter?console.warn("WARNING: EXPO.newsFilter is already defined!"):EXPO.newsFilter=function(){var t={};t.opt={};EXPO.common;return t.init=function(t){$.extend(this.opt,t);var e=this;$(function(){var t=$(".news-filter-block"),i=$(".custom-select.theme select",t),a=$(".custom-select.tags input",t),l=t.children("form");i.attr("multiple","multiple"),i.select2({placeholder:e.opt.theme.placeholder,width:"368px",maximumSelectionSize:3}),a.val("0"),a.select2({placeholder:e.opt.tags.placeholder,width:"368px",multiple:!0,maximumSelectionSize:5,ajax:{url:e.opt.tags.url,dataType:"json",quietMillis:200,data:function(t,e){var a=i.val();return a||(a=[]),{term:t,page:e,themes:a}},results:function(t){var e=[];return $.each(t,function(t,i){e.push({id:i.id,text:i.label})}),{results:e}}},initSelection:function(t,i){var a;t.val(""),""!=$.trim(t.attr("data-predifined"))&&"[]"!=$.trim(t.attr("data-predifined"))?(a=JSON.parse(t.attr("data-predifined")),i(a)):$(" .custom-select.tags .select2-input").width(336).addClass("select2-default").val(e.opt.tags.placeholder)}}),a.on("change",function(){l.submit()}),i.on("change",function(){l.submit()})})},t}(); |
var EXPO=EXPO||{};EXPO.newsFilter?console.warn("WARNING: EXPO.newsFilter is already defined!"):EXPO.newsFilter=function(){var t={};t.opt={};EXPO.common;return t.init=function(t){$.extend(this.opt,t);var e=this;$(function(){var t=$(".news-filter-block"),i=$(".custom-select.theme select",t),a=$(".custom-select.tags input",t),l=t.children("form");i.attr("multiple","multiple"),i.select2({placeholder:e.opt.theme.placeholder,width:"368px",maximumSelectionSize:3}),a.val("0"),a.select2({placeholder:e.opt.tags.placeholder,width:"368px",multiple:!0,maximumSelectionSize:5,ajax:{url:e.opt.tags.url,dataType:"json",quietMillis:200,data:function(t,e){var a=i.val();return a||(a=[]),{term:t,page:e,themes:a}},results:function(t){var e=[];return $.each(t,function(t,i){e.push({id:i.id,text:i.label})}),{results:e}}},initSelection:function(t,i){var a;t.val(""),""!=$.trim(t.attr("data-predifined"))&&"[]"!=$.trim(t.attr("data-predifined"))?(a=JSON.parse(t.attr("data-predifined")),i(a)):$(" .custom-select.tags .select2-input").width(336).addClass("select2-default").val(e.opt.tags.placeholder)}}),a.on("change",function(t){l.submit()}),i.on("change",function(t){l.submit()})})},t}(); |
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@ |
|||||||
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,i=EXPO.common,s={},o=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return o.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,s={},o=this,e=function(t){t.success?(console.log("ok"),$(o.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,t=i.getRequest(s,this.url,e)}},s.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),s.init=function(s){$.extend(this.opt,s);var e=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new o(this,e.opt.note);e.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),i.opt.addCalendarText=this.opt.addCalendarText,i.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(e.opt.visit.activeClass)?($("."+e.opt.visit.activeClass).hide().siblings("."+e.opt.visit.passiveClass).show(),$("#"+e.opt.visit.visitorsListId).append(e.opt.visit.currentHtml),$("#"+e.opt.visit.somebodyId).removeClass("hidden"),$("#"+e.opt.visit.nobodyId).addClass("hidden")):($("."+e.opt.visit.passiveClass).hide().siblings("."+e.opt.visit.activeClass).show(),$("#"+e.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+e.opt.visit.visitorsListId).children().length&&($("#"+e.opt.visit.somebodyId).addClass("hidden"),$("#"+e.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var s=$(this).serialize(),o=$(this).attr("action"),e=$(this),n=function(i){var s=function(){$(".err",e).removeClass("err"),$(".pwf-msg",e).text("")};if(1!=i.success){s();for(var o in i.errors)i.errors.hasOwnProperty(o)&&$('input[name="'+o+'"]',e).closest(".required").addClass("err").siblings(".pwf-msg").text(i.errors[o])}else s(),$("input:text",e).val(""),$.fancybox.close();t.hide()};return t.show(),i.postRequest(s,o,n),!1})},s}(); |
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,i=EXPO.common,s={},e=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,s={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,t=i.getRequest(s,this.url,o)}},s.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),s.init=function(s){$.extend(this.opt,s);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),i.opt.addCalendarText=this.opt.addCalendarText,i.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var s=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(i){var s=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=i.success){s();for(var e in i.errors)i.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(i.errors[e])}else s(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),i.postRequest(s,e,n),!1})},s}(); |
||||||
@ -1 +1 @@ |
|||||||
var EXPO=EXPO||{};EXPO.place=EXPO.place||{},EXPO.place.object?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.place.object=function(){var t={},n=function(t,n){this.$annotation=$("."+t.annotationClass,n),this.$fullPart=$("."+t.fullPartClass,n),this.$readMore=$("."+t.readMoreClass,n),this.cutLength=t.cutLength,this.fullText,this.init()};return n.prototype={init:function(){{var t=this;this.$annotation.text().slice(0,t.cutLength)}this.fullText=this.$annotation.html().trim(),this._setMoreLess(this.fullText,t.cutLength,10)},showMore:function(){this.$readMore.hide(),this.$annotation.hide(),this.$fullPart.removeClass("hidden")},_cutAnnotation:function(){},_setMoreLess:function(t,n,i){var a=t;if(!(a.length+i<n)){var e=a.substring(0,n),s='<span class="firstHalf">'+e+"</span>";this.$annotation.html(s),this.$annotation.find("p:last").append("..."),this.$fullPart.html(a)}}},t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var i=this;this.articles=[],$("."+i.opt.article.class).each(function(){var t=new n(i.opt.article,this);t.$readMore.on("click",function(){t.showMore()}),i.articles.push(t)})},t}(); |
var EXPO=EXPO||{};EXPO.place=EXPO.place||{},EXPO.place.object?console.warn("WARNING: EXPO.place.object is already defined!"):EXPO.place.object=function(){var t={},n=function(t,n){this.$annotation=$("."+t.annotationClass,n),this.$fullPart=$("."+t.fullPartClass,n),this.$readMore=$("."+t.readMoreClass,n),this.cutLength=t.cutLength,this.fullText,this.init()};return n.prototype={init:function(){var t=this;this.$annotation.text().slice(0,t.cutLength);this.fullText=this.$annotation.html().trim(),this._setMoreLess(this.fullText,t.cutLength,10)},showMore:function(){this.$readMore.hide(),this.$annotation.hide(),this.$fullPart.removeClass("hidden")},_cutAnnotation:function(){},_setMoreLess:function(t,n,i){var a=t;if(!(a.length+i<n)){var e=a.substring(0,n),s='<span class="firstHalf">'+e+"</span>";this.$annotation.html(s),this.$annotation.find("p:last").append("..."),this.$fullPart.html(a)}}},t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var i=this;this.articles=[],$("."+i.opt.article["class"]).each(function(){var t=new n(i.opt.article,this);t.$readMore.on("click",function(){t.showMore()}),i.articles.push(t)})},t}(); |
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue