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

templates/client/includes/header.html

@@ -4,7 +4,7 @@
 
 <header class="layout">
 	<div class="header-wrap layout-wrap">
-		<div class="logo">
+		<div class="logo beta">
 			<h2><a href="/"><strong>Expomap</strong> <b>{% trans 'Выставки, конференции, семинары' %}</b></a></h2>
 		</div>
 

templates/client/service/tickets.html

@@ -138,7 +138,7 @@
 
                         <div class="rq-order-button">
                             <div class="rqob-wrap">
-                                <div class="rqob-price">{% trans 'Регистрация' %} {{ service.price }} {{ service.currency }} + {% trans 'билет организатора' %}</div>
+                                <div class="rqob-price">{% trans 'Регистрация 2000 руб.' %} {% comment %}{{ service.price }} {{ service.currency }}{% endcomment %} + {% trans 'билет организатора' %}</div>
                                 <div class="rqob-button">
                                     {% if service.price %}
                                     <input id="id_price" name="price" type="hidden" value="{{ service.price  }}"/>

templates/client/static_client/css/main.css

@@ -408,6 +408,12 @@ hr {
 	background: url(../img/logo.png) 0 0 no-repeat;
 	margin-left: -67px;
 }
+.page-wrap > header .logo.beta strong {
+	background: url(../img/logo_beta.png) 0 0 no-repeat;
+	width: 225px;
+
+
+}
 
 .page-wrap > header .logo b {
 	margin-top: -8px;