EXPO-25 blank.html

11 years ago · 9cb757c06f
parent 00d8ece4bc
commit 9cb757c06f
1 changed files with 97 additions and 93 deletions
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@ -1,7 +1,6 @@
 {% load static %}
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 {% comment %}
 This template include basic anf main styles and js files,
   block with header and footer, which same in all pages,
@ -13,31 +12,36 @@ This template include basic anf main styles and js files,
 head with title block, style block
 {% endcomment %}
 <!DOCTYPE html>
 <!--[if lt IE 8]>     <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
 <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+<!--[if gt IE 8]><!-->
 <html class="no-js"> <!--<![endif]-->
 <!--if IE 8><script src="js/selectivizr-min.js"></script><![endif]-->
 <head>
 	{% include 'includes/meta.html' %}
 	<link rel="icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
 	<link rel="shortcut icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
 	<link rel="stylesheet" href="{% static 'client/css' %}{% if debug %}/{% else %}_min/{% endif %}vendor{% if debug %}{% else %}.min{% endif %}.css">
-    <!--todo: вернуть минифицированную версию-->
+
-	<!--<link rel="stylesheet" href="{% static 'client/css' %}{% if debug %}/{% else %}_min/{% endif %}main{% if debug %}{% else %}.min{% endif %}.css">-->
+
 	{% if request.GET.debug == '1' %}
 		<link rel="stylesheet" href="{% static 'client/css/main.css' %}">
 	{% else %}
 		<link rel="stylesheet" href="{% static 'client/css_min/main.min.css' %}">
 	{% endif %}
 	<link rel="stylesheet" href="{% static 'client/lib/font-awesome-4.3.0/css/font-awesome.min.css' %}">
 	{% block styles %}
 	{% endblock %}
 	<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
 	<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
 	<script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}"  type="text/javascript"></script>
-    <!--<script src="{% static '
+    {% if request.GET.debug == '1' %}
    client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.common{% if debug %}{% else %}.min{% endif %}.js"></script>-->
        <script src="{% static 'client/js/_modules/block.common.js' %}"></script>
-
+    {% else %}
-	<!--if IE 8><script src="js/selectivizr-min.js"></script><![endif]-->
+        <script src="{% static 'client/js_min/_modules/block.common.min.js' %}"></script>
    {% endif %}
 	<script type="text/javascript">
 		EXPO.common.init({
 			activeClass:"active",
@ -70,9 +74,10 @@ This template include basic anf main styles and js files,
 <!--[if lt IE 8]>
 	<p class="chromeframe">Вы используете <strong>устаревший</strong> браузер. Пожалуйста, <a href="http://browsehappy.com/">обновите его</a> или <a href="http://www.google.com/chromeframe/?redirect=true">активируйте Google Chrome Frame</a>, чтобы расширить возможности вашего браузера.</p>
 <![endif]-->
-<!-- Английский вариант текста для p.chromeframe
+{% comment %}
 <!-- Английский вариант текста для p.chromeframe -->
 	<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
-->
+{% endcomment %}
 	<div class="page-wrap">
 	{% block header %}
 		{% include 'client/includes/header.html' %}
@ -125,16 +130,15 @@ This template include basic anf main styles and js files,
 	{% endblock %}
 	</div>
 {% block photogallery %}
 {% endblock %}
-    <!-- scripts -->
+{# js libs #}
 	<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places"></script>
-<!--vendor scripts concatenated-->
+{% if request.GET.debug == '1' %}
-    <script type="text/javascript" src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}vendor{% if debug %}{% else %}.min{% endif %}.js"></script>
+    <script src="{% static 'client/js/vendor.js' %}"></script>
-    <!--<script type="text/javascript" src="{% static 'client/js/vendor.js' %}"></script>-->
+{% else %}
-
+    <script src="{% static 'client/js_min/vendor.min.js' %}"></script>
 {% endif %}
 <div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>
 </body>