mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

Browse Source
remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent bc267464c4 4c179cb3e5
commit 102bff02b1
5 changed files with 87 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      templates/client/blank.html
  2. 14
      templates/client/includes/banners/tops.html
  3. 2
      templates/client/popups/cemat_modal.html
  4. 13
      templates/client/static_client/js/rejs/banners.js
  5. 72
      templates/client/static_client/js/rejs/tops.js

2
templates/client/blank.html
Unescape View File

@ -87,7 +87,7 @@ This template include basic anf main styles and js files,
"tag": "{{ tag }}" "tag": "{{ tag }}"
}; };
</script> </script>
<script type="text/javascript" src="{% static 'client/js/banners.js' %}"></script> <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}"></script>
</head> </head>
<body {% block body_class %}{% endblock %}> <body {% block body_class %}{% endblock %}>

14
templates/client/includes/banners/tops.html
Unescape View File

@ -1,13 +1,7 @@
{% load static %}
<div id="expo_top_events"> <div id="expo_top_events">
</div> </div>
<script>
/* НУЖНО ЛИ??? */ <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
window.sendData = {
"theme": [{{ themes|join:", " }}],
"country": "{{ country }}",
"city": "{{ city }}",
"tag": "{{ tag }}"
};
var url = "/expo-b/get-tops/";
</script>

2
templates/client/popups/cemat_modal.html
Unescape View File

@ -16,7 +16,7 @@
<img src="/static/client/img/expo_b/cemat_modal2.png"> <img src="/static/client/img/expo_b/cemat_modal2.png">
</a> </a>
</div> </div>
<button >Узнать подробнее</button> <button>Узнать подробнее</button>
</form> </form>
</div> </div>

13
templates/client/static_client/js/banners.js → templates/client/static_client/js/rejs/banners.js
Unescape View File

@ -4,10 +4,17 @@
var API_URL_ROOT = "/expo-b/get-banners/"; var API_URL_ROOT = "/expo-b/get-banners/";
var getUrl = function () { var getUrl = function () {
var catalog = "";
var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
if (parts) {
catalog = parts[1];
}
var data = window.sendData; var data = window.sendData;
if (data instanceof Object) { if (data instanceof Object) {
var search = []; var search = ["catalog=" + catalog];
for (var key in data) { for (var key in data) {
if (data.hasOwnProperty(key)) { if (data.hasOwnProperty(key)) {
@ -23,9 +30,7 @@
} }
} }
if (search.length) { return API_URL_ROOT + "?" + search.join("&");
return API_URL_ROOT + "?" + search.join("&");
}
} }
return API_URL_ROOT; return API_URL_ROOT;

72
templates/client/static_client/js/rejs/tops.js
Unescape View File

@ -0,0 +1,72 @@
(function () {
"use strict";
var API_URL_ROOT = "/expo-b/get-tops/";
var PARENT_ID = "expo_top_events";
var getUrl = function () {
var catalog = "";
var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
if (parts) {
catalog = parts[1];
}
var data = window.sendData;
if (data instanceof Object) {
var search = ["catalog=" + catalog];
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));
}
}
}
return API_URL_ROOT + "?" + search.join("&");
}
return API_URL_ROOT;
};
var getTops = 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(event.target.responseText);
} catch (error) {
// do nothing
}
}
}
};
xhr.send();
};
var insertTops = function (text) {
var parent = document.getElementById(PARENT_ID);
if (parent) {
parent.innerHTML = text;
}
};
var main = function () {
getTops(getUrl(), insertTops);
};
window.addEventListener("load", main);
})();
Write Preview
Loading…
Cancel
Save