Merge remote-tracking branch 'origin/dev' into dev

templates/forms/f_registration.html

@@ -115,9 +115,9 @@
                 </div>
           <div class="button_register">
                <button type="submit" id="registration" onclick="SendRegistrationForm(this)"> {% translate "Зарегистрироваться" %} </button>
-              <div class="info_text_wrapper">
+                <div class="info_text_wrapper">
-                  <div class="info_text">{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}</div>
+                    <div class="info_text">{% trans 'На Вашу почту отправлено письмо для подтверждения регистрации. Если не получили письмо, то проверьте папку СПАМ' %}</div>
-              </div>
+                </div>
           </div>
 
     </form>

templates/mail/m_confirm_email.html

@@ -6,7 +6,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+                      <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_found_matched_routes.html

@@ -4,7 +4,8 @@
     padding:10px; background-color: #F8F8F8;">
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_registration.html

@@ -6,7 +6,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_request_offer.html

@@ -4,7 +4,8 @@
 >
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
         <p style="font-weight:700; font-size:25px; text-align:center;
             padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;

templates/mail/m_user_subscribes_that_is_going_to_finish.html

@@ -4,7 +4,8 @@
     padding:10px; background-color: #F8F8F8;">
     <div style="line-height:1.0em; width: 660px">
         <div style="padding:5px; text-align: center;">
-            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
+{#            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">#}
+            <img src="https://tripwb.com/static/img/png/finlogo.png" style="height: 90px;">
         </div>
 
         <p style="font-weight:700; font-size:25px; text-align:center;