1609 sems to be done

static/client/js/rejs/banners.min.js

@@ -0,0 +1 @@
+(function(){"use strict";var API_URL_ROOT="/expo-b/get-banners/";var getUrl=function(top_load){var search=[];var parts=/^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);if(parts){search.push("catalog="+encodeURIComponent(parts[1]));}else{search.push("catalog=");}if(!top_load){var elements=$("[id^=\"expo_b_\"]").not("[id=\"expo_b_under_search\"]");for(var j=0;j<elements.length;j++){search.push("places="+encodeURIComponent($(elements[j]).attr("id")));}}else{search.push("places="+encodeURIComponent('expo_b_under_search'));}var data=window.sendData;if(data instanceof Object){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("&");};var runCallback=function(callback,arg){try{callback(JSON.parse(arg));}catch(error){}};var getBanners=function(url,callback,top_load){var xhr=new XMLHttpRequest();xhr.open("GET",url,true);xhr.onreadystatechange=function(event){if(event.target.readyState===4){if(event.target.status===200){if(document.readyState==="loading"&&top_load&&!window.marker_DOMbannersjsElementInserted){document.addEventListener("DOMbannersjsElementInserted",function(){runCallback(callback,event.target.responseText);});}else{runCallback(callback,event.target.responseText);}}}};xhr.send();};var addBanner=function(banner){var parent=document.getElementById(banner.id);if(parent){if(banner.is_popup){window.is_popup_banner=true;if(banner.is_img){parent.innerHTML="<header class=\"clearfix\"><div class=\"pw-title\"></div></header><div class=\"pw-body clearfix\">"+"<a href=\""+banner.url+"\"><img src=\""+banner.img+"\" alt=\""+banner.alt+"\" /></a></div>";}else if(banner.is_html){parent.innerHTML=banner.text;}$("#expo-form-popup").on("submit",function(e){e.preventDefault();window.location=$("#expo-form-popup").attr("action");});setTimeout(function(){$.fancybox.open([{"href":"#"+banner.id}],{});},5000);}else{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.innerHTML=a.outerHTML;}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(top_load){var top_load=top_load||false;getBanners(getUrl(top_load),insertBanners,top_load);if(!top_load){document.dispatchEvent(window.bannersjsRequestDone);}};main(true);document.addEventListener("DOMContentLoaded",function(){main(false);});})();

support/dev/hit.expomap.ru

@@ -51,14 +51,20 @@ server {
     }
 
     location /static {
+        access_log off;
+        expires max;
         root   /home/www/proj;
     }
 
     location /media {
+        access_log off;
+        expires max;
         root   /home/www/proj;
     }
 
     location /templates {
+        access_log off;
+        expires max;
         root   /home/www/proj/static;
     }
 
@@ -66,9 +72,9 @@ server {
         root /home/old_files;
     }
 
-    location ~* ^.+\.(rss|atom|jpg|jpeg|gif|png|ico|rtf|js|css)$ {
-        expires max;
-    }
+    #location ~* ^.+\.(rss|atom|jpg|jpeg|gif|png|ico|rtf|js|css)$ {
+    #    expires max;
+    #}
 
 }
 

templates/client/blank.html

@@ -89,7 +89,11 @@ This template include basic anf main styles and js files,
         window.is_popup_banner = false;
       })();
       </script>
-      <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}" async></script>
+      {% if request.GET.debug == '1' %}
+        <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}" async></script>
+      {% else %}
+        <script type="text/javascript" src="{% static 'client/js/rejs/banners.min.js' %}" async></script>
+      {% endif %}
     {% endif %}
 
 	{% if request.GET.debug == '1' %}

templates/client/includes/accounts/current_user.html

@@ -437,13 +437,14 @@
 	</div>
 </div>
 {% block scripts %}
-<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
 <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
 <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
 {% if request.GET.debug == '1' %}
-<script src="{% static 'client/js/_modules/page.profile.js' %}"></script>
+	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
+	<script src="{% static 'client/js/_modules/page.profile.js' %}"></script>
 {% else %}
-<script src="{% static 'client/js_min/_modules/page.profile.min.js' %}"></script>
+	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.min.js' %}"></script>
+	<script src="{% static 'client/js_min/_modules/page.profile.min.js' %}"></script>
 {% endif %}
 <script>
 	EXPO.profile.init({

templates/client/includes/catalog_search.html

@@ -95,12 +95,12 @@
 		</div>
 	</form>
 	{% block scripts %}
-	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
 	{% if request.GET.debug == '1' %}
-	<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
+		<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
+		<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
 	{% else %}
-
-	<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
+		<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.min.js' %}"></script>
+		<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
 	{% endif %}
 	<script>
 		var closerTextSingle = "{% trans ' и еще _ позиция' %}",

templates/client/includes/catalog_search_main.html

@@ -106,11 +106,12 @@
 		</div>
 	</div>
 	{% block scripts %}
-	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
 	{% if request.GET.debug == '1' %}
-	<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
+		<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
+		<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
 	{% else %}
-	<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
+		<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.min.js' %}"></script>
+		<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
 	{% endif %}
 	<script>
 		var closerTextSingle = "{% trans ' и еще _ позиция' %}",

templates/client/includes/company/company_edit.html

@@ -541,13 +541,14 @@
 	<script src="{% static 'client/js/plugins/select2_locale_ru.js' %}"></script>
 {% endblock %}
 {% block scripts %}
-<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
 <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
 <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
 {% if request.GET.debug == '1' %}
-<script src="{% static 'client/js/_modules/page.company.js' %}"></script>
+	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
+	<script src="{% static 'client/js/_modules/page.company.js' %}"></script>
 {% else %}
-<script src="{% static 'client/js_min/_modules/page.company.min.js' %}"></script>
+	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.min.js' %}"></script>
+	<script src="{% static 'client/js_min/_modules/page.company.min.js' %}"></script>
 {% endif %}
 <script>
 	EXPO.company.init({