Minor changes in file structure

11 years ago · 4cf03981b7
parent 546b89569b
commit 4cf03981b7
5 changed files with 21 additions and 16 deletions
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@ -87,7 +87,7 @@ This template include basic anf main styles and js files,
            "tag": "{{ tag }}"
        };
    </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>
 <body {% block body_class %}{% endblock %}>
--- a/templates/client/includes/banners/tops.html
+++ b/templates/client/includes/banners/tops.html
@ -1,13 +1,5 @@
 <div id="expo_top_events">
 </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>
--- a/templates/client/popups/cemat_modal.html
+++ b/templates/client/popups/cemat_modal.html
@ -16,7 +16,7 @@
                    <img src="/static/client/img/expo_b/cemat_modal2.png">
                </a>
            </div>
-            <button >Узнать подробнее</button>
+            <button>Узнать подробнее</button>
        </form>
    </div>
--- a/templates/client/static_client/js/rejs/banners.js
+++ b/templates/client/static_client/js/rejs/banners.js
@ -4,10 +4,17 @@
    var API_URL_ROOT = "/expo-b/get-banners/";
    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 = [];
+            var search = ["catalog=" + catalog];
            for (var key in data) {
                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;
--- a/templates/client/static_client/js/rejs/tops.js
+++ b/templates/client/static_client/js/rejs/tops.js
@ -0,0 +1,8 @@
 (function () {
    "use strict";
    var API_URL_ROOT = "/expo-b/get-tops/";
    var PARENT_ID = "expo_top_events";
    console.log("TOPS");
 })();