Merge remote-tracking branch 'origin/main'

RoutesApp/views.py

@@ -32,6 +32,7 @@ def route_search_results_View(request):
             'show_filter_and_results': True,
             'owner_type': data['owner_type'],
             'last_el': routes_Dict['last_el'],
+            'page_type': 'routes'
         }
     if 'from_address_point_txt' in routes_Dict:
         data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})

static/css/mobile_styles.css

@@ -4,7 +4,24 @@
 @media (max-width: 1199px){
     .benefit_img_about_service>figure>img{
         width: 173px;
-    }
+        }
+
+        .type_of_subscribes{
+        align-items: center;
+        }
+        .container_subscribe{
+                margin: 20px 16px;
+                width: 42%;
+        }
+        .another_subscribe{
+            width: 90%;
+        }
+        .input_f_profile{
+            width: calc(90% - 30.4px);
+        }
+        #img_msg_by_email{
+            left: 33%;
+        }
 }
 @media (max-width: 1064px){
    .header_logo, .header_btn_mover, .header_btn_sender{
@@ -76,7 +93,7 @@
          border-top: 2px solid #E6E6E6;
          border-right: 2px solid #E6E6E6;
          border-bottom: 2px solid #E6E6E6;
-         width: 40.5%;
+         width: 60px;
      }
      .abbreviation_airport_in_search{
          float: left;
@@ -84,7 +101,7 @@
          border-right: 2px solid #E6E6E6;
          border-bottom: 2px solid #E6E6E6;
          height: 96%;
-         width: 40%;
+         /*width: 40%;*/
      }
 
      .from_address_point_txt.find_route.first{
@@ -95,7 +112,7 @@
 
      }
      .to_address_point_txt.find_route{
-            width: 55.6%;
+            /*width: 55.6%;*/
             float: left;
             border-top: 2px solid #E6E6E6;
             border-left: 2px solid #E6E6E6;
@@ -118,6 +135,14 @@
          width: 100%;
      }
 
+     .subscribe_inf_right_part{
+         width: 38%;
+         margin-bottom: 20px;
+     }
+     .subscribe_inf>.clear_both{
+         clear: unset;
+     }
+
     .button_profile_header{
         display: none;
     }
@@ -128,7 +153,7 @@
         margin-right: 37px;
     }
     .line_f_header{
-            top: 45px;
+            top: 43px;
     }
 
     .registration_button,
@@ -157,7 +182,6 @@
         width: 100%;
     }
     .wrapper_tab_button{
-        width: 55%;
         margin-top: 20px;
     }
     .benefit_img{
@@ -171,9 +195,7 @@
     .button_container{
         margin-top: unset;
     }
-    .tab-btn-2{
+
-        margin: 0 0 5px 0;
-    }
     button#more_button{
         width: 50%;
         margin-top: 40px;
@@ -183,6 +205,10 @@
         line-height: 42px;
     }
 
+    .subscribe_inf_left_part{
+        width: 50%;
+    }
+
 
     details{
         width: 100%;
@@ -409,19 +435,14 @@
     width: 32%;
 }
 
-    .type_of_subscribes{
+
-        flex-direction: column;
-        align-items: center;
-    }
 
     .subscribes_container{
         width: 100%;
     }
 
-    .container_subscribe{
+
-        margin: 20px 16px;
+
-        width: unset;
-    }
 
     .first-decr-subscribe{
         width: 55%;
@@ -487,7 +508,7 @@
 
     .cut_width_f_curtain{
         position: sticky;
-        top: 61px;
+        top: 0;
     }
     .menu_buttons{
         /*background: #FFFFFF;*/
@@ -504,6 +525,7 @@
         position: absolute;
         width: 320px;
         top: 46px;
+        display: none;
     }
 
     .menu_buttons.left.close{
@@ -512,6 +534,16 @@
         position: absolute;
         width: 320px;
     }
+    .menu_buttons.left.close.filters{
+        left: -347px;
+        transition: 200ms;
+        position: absolute;
+        width: 320px;
+    }
+    .block_w_paging.routes {
+        width: 100%;
+        float: right;
+    }
     .menu_buttons.left .handler_menu{
         transform: rotate(90deg);
         left: -48px;
@@ -525,15 +557,15 @@
         padding: 7px 18px 7px 18px;
     }
     .menu_buttons.right.open{
-    right: 0;
+        right: 0;
-    transition: 200ms;
+        transition: 200ms;
-    position: absolute;
+        position: absolute;
-    display: block;
+        /* padding-top: 10px; */
-    /* padding-top: 10px; */
+        width: 320px;
-    width: 320px;
+        top: 0;
-    top: 0;
+        border-radius: 10px;
-    border-radius: 10px;
+        display: block;
-}
+    }
 
     .menu_buttons.left.open{
         left: 0;
@@ -596,6 +628,7 @@
 
      .text_f_curtain{
          display: inline-block;
+         font-size: 13px;
      }
 
     .menu_profile{
@@ -621,6 +654,9 @@
         top: 0;
         right: 0;
     }
+    .block_overlay.show.routes{
+        display: block;
+    }
     #customer>a, #mover>a{
         left: 5%;
     }
@@ -763,9 +799,12 @@
     .left-part-carrier-card, .inf_carrier_container{
         width: unset;
         float: none;
-
+        }
+    .inf_carrier_container{
+        padding-top: 70px;
     }
 
+
     .carrier-card>.clear_both{
         clear: unset;
     }
@@ -846,6 +885,13 @@
         font-size: 12px;
 
     }
+
+    /*.phones_carrier{*/
+    /*    display: inline-block;*/
+    /*}*/
+    /*.phones_carrier>.inf_carrier_icon{*/
+    /*    width: 100%;*/
+    /*}*/
 /* END   my_routes*/
 
 /*    support*/
@@ -872,8 +918,8 @@
 /*    subscribe*/
 
     .b_another_subscribes{
-        max-width: 272px;
+        width: 100%;
-        margin: auto;
+
     }
     .state_subscribe, .state_subscribe > a{
         font-size: 14px;
@@ -882,17 +928,10 @@
         line-height: 20px;
     }
 
-     .subscribe_inf{
-        max-width: 260px;
-        margin: auto;
-    }
 
 
-    .subscribe_inf_left_part{
+
-        width: 100%;
+
-        float: none;
-        margin: 10px auto;
-    }
     .label_toggle_switch_cont{
         width: 92%;
     }
@@ -923,10 +962,7 @@
         line-height: 20px;
     }
 
-    .subscribe_inf_right_part{
+
-        width: 100%;
-        float: none;
-    }
 
     .title_options{
         font-size: 18px;
@@ -940,11 +976,11 @@
         font-weight: 400;
         line-height: 20px;
         margin: 20px auto;
-        width: 262px;
+        width: 100%;
 
     }
     .another_subscribe{
-        width: 102%;
+        width: 100%;
         height: unset;
         flex-direction: column;
         margin: 20px auto;
@@ -975,6 +1011,16 @@
         float: none;
         width: unset;
     }
+    .f-l>.clear_both{
+        clear: unset;
+    }
+    .f-r>.clear_both{
+        clear: unset;
+    }
+
+    .block_inf_profile>.clear_both{
+        clear: unset;
+    }
     .block_inf_profile{
         padding-top: 20px;
         border-bottom:unset;
@@ -989,7 +1035,7 @@
             margin: 2.5% 0.5% 0.5% 0.5%;
     }
     .wrapper_switch_cont{
-        max-width: 245px;
+        width: 100%;
     }
 
     #customer>.text_btn_profile{
@@ -1009,14 +1055,43 @@
 
 /*    */
 
+}
+@media (max-width: 847px){
+     .container_subscribe{
+        margin: 20px 16px;
+        width: unset;
+    }
+    .type_of_subscribes{
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .input_toggle_switch_display{
+        width: 26px;
+    }
+    .label_toggle_switch_cont{
+        width: 88%;
+    }
+
+    .toggle_switch_cont{
+        margin-top: 6px;
+        width: 12%;
+    }
+     .carrier_inf_moving.left{
+        width: 46%;
+    }
+    .carrier_inf_moving.right{
+        width: 37%;
+    }
 }
 @media (max-width: 828px){
-    .to_address_point_txt.find_route {
+    /*.to_address_point_txt.find_route {*/
-    width: 54.6%;
+    /*width: 54.6%;*/
-    }
+    /*}*/
-    .from_address_point_txt.find_route.first {
+    /*.from_address_point_txt.find_route.first {*/
-        width: 54.1%;
+    /*    width: 54.1%;*/
-    }
+    /*}*/
+
 }
 @media (max-width: 776px){
 
@@ -1033,6 +1108,8 @@
 
     }
 
+
+
 }
 @media (max-width: 699px){
     .block_overlay.show{
@@ -1074,16 +1151,43 @@
     .info_profile{
         width: 100%;
     }
+
+    .another_subscribe{
+        padding: 10px 10px 0 10px;
+        flex-direction: unset;
+        justify-content: space-evenly;
+    }
 }
 @media (max-width: 687px){
-    .to_address_point_txt.find_route {
+    /*.to_address_point_txt.find_route {*/
-        width: 52.6%;
+    /*    width: 52.6%;*/
+    /*}*/
+    /*.from_address_point_txt.find_route.first {*/
+    /*    width: 52.1%;*/
+    /*}*/
+
+     .subscribe_inf{
+        width: 95%;
     }
-    .from_address_point_txt.find_route.first {
+     .subscribe_inf_right_part{
-        width: 52.1%;
+        width: 100%;
+        float: none;
     }
+     .subscribe_inf_left_part{
+        width: 100%;
+        float: none;
+        margin: 10px auto;
+    }
+
+     .wrapper_switch_cont>.width-100{
+         display: inline-block;
+     }
+
+
+
+
 }
-@media (max-width: 575px){
+@media (max-width: 575px)   {
 
     #how_it_work_b{
         width: 100%;
@@ -1118,25 +1222,41 @@
     .cont-el-form-search-carrier.last > select{
             width: 100%;
     }
-     .to_address_point_txt.find_route {
+    /* .to_address_point_txt.find_route {*/
-        width: 51.6%;
+    /*    width: 51.6%;*/
+    /*}*/
+    /*.from_address_point_txt.find_route.first {*/
+    /*    width: 51.1%;*/
+    /*}*/
+    .another_subscribe{
+            padding: unset;
+            flex-direction: column;
+            justify-content: unset;
     }
-    .from_address_point_txt.find_route.first {
+
-        width: 51.1%;
+    .dropdown-content{
+        width: 190px;
+        top: 27px;
+        left: -83px;
     }
 }
-@media (max-width: 440px){
+
-    .container_inp_w_abr{
+@media (max-width: 466px) {
+    /*.to_address_point_txt.find_route {*/
+    /*    width: 48.4%;*/
+    /*}*/
+
+    /*.from_address_point_txt.find_route.first {*/
+    /*    width: 47.95%;*/
+    /*}*/
+
+
+    .container_inp_w_abr {
         width: 99%;
     }
 
-    .to_address_point_txt.find_route {
-        width: 48.4%;
-    }
-    .from_address_point_txt.find_route.first {
-        width: 47.95%;
-    }
 }
+
 @media (max-width: 440px){
     .benefit_img_about_service {
      flex-direction: column;
@@ -1151,6 +1271,13 @@
 }
 @media (max-width: 360px){
 
+    .wrapper_tab_button{
+        width: 55%;
+        /*margin-top: 20px;*/
+    }
+
+
+
 }
 
 

static/css/styles(boris).css

@@ -949,12 +949,13 @@
     border-left: 1px solid #E6E6E6;
     display: block;
     height: 20px;
-    width: 55.1%;
+    /*width: 55.1%;*/
     float: left;
     background-image: none !important;
     margin-top: 0;
     padding: 20px 15.2px;
     border-radius: 10px 0 0 10px;
+    width: calc(100% - 95px);
 }
 
 .to_address_point_txt.find_route{
@@ -964,7 +965,7 @@
     border-left: 1px solid #E6E6E6;
     display: block;
     height: 20px;
-    width: 55.1%;
+    width: calc(100% - 95px);
     border-radius: 0;
     float: left;
     background-image: none !important;
@@ -1016,7 +1017,7 @@
     padding: 20px 10px;
     background: url(/static/img/svg/Calendar.svg) white 50%;
     background-repeat: no-repeat;
-    background-position: right 5% bottom 45%;
+    background-position: right 2% bottom 45%;
 }
 
 
@@ -1060,8 +1061,8 @@
 .abbreviation_airport_in_search{
     display: inline-block;
     float: left;
-    width: 29%;
     height: 97%;
+    width: 60px;
     border-top: 1px solid #E6E6E6;
     border-right: 1px solid #E6E6E6;
     border-bottom: 1px solid #E6E6E6;
@@ -1090,18 +1091,20 @@
 }
 
 
-.block-filters-find-route{
+.block-filters-find-route {
-    min-height: 660px;
+    min-height: calc(100vh - 200px);
     background: #FFFFFF;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
-    width: 26%;
+    /*!*width: 26%;*/
+    width: 100%;
     float: left;
     padding: 2%;
     position: sticky;
     top: 76px;
     border-radius: 10px;
+    max-height: calc(100vh - 125px);
+    overflow-y: auto;
 }
-
 .block_w_paging.routes{
     width: 68%;
     float: right;
@@ -1657,7 +1660,7 @@
 }
 
 .another_subscribe{
-    width: 98%;
+    width: calc(100% - 50px);
     padding: 0 20px;
     background: #FFFFFF;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
@@ -2226,6 +2229,10 @@
     /*display: none;*/
 }
 
+.menu_buttons.filters{
+    width: 320px;
+}
+
 /* for curtain right*/
 
 .cut_width_f_curtain{
@@ -2239,6 +2246,17 @@
     height: 695px;
 }
 
+.cut_width_f_curtain.left{
+    max-width: 1280px;
+    text-align: -webkit-right;
+    position: sticky;
+    margin: auto;
+    z-index: 998;
+    top: 61px;
+    float: left;
+    height: 695px;
+}
+
 .menu_buttons{
     /*background: #FFFFFF;*/
     /*height: 100vh;*/
@@ -2282,6 +2300,20 @@
     position: absolute;
     width: 320px;
 }
+
+.menu_buttons.left.close.filters{
+    width: 294px;
+    background: #FFFFFF;
+    border-radius: 10px;
+    max-height: 83vh;
+    left: 0;
+    padding: 13px;
+    transition: 200ms;
+    /* position: fixed; */
+    float: left;
+    text-align: left;
+    top: 0;
+}
 .menu_buttons.right.open{
     right: 0;
     transition: 200ms;
@@ -2307,6 +2339,19 @@
 
 }
 
+.menu_buttons.left.open.filters{
+    width: 294px;
+    background: #FFFFFF;
+    border-radius: 10px;
+    max-height: 83vh;
+    left: 0;
+    padding: 13px;
+    transition: 200ms;
+    /* position: fixed; */
+    float: left;
+    text-align: left;
+}
+
 .support .menu_buttons.left.open{
     margin-top: 49px;
 }
@@ -2409,20 +2454,20 @@
 .menu_profile>div{
     width: 274px;
 }
-.menu_profile>div:first-of-type{
+/*.menu_profile>div:first-of-type{*/
-    color: #000;
+/*    color: #000;*/
-    font-size: 14px;
+/*    font-size: 14px;*/
-    width: 274px;
+/*    width: 274px;*/
-    border-radius: 0;
+/*    border-radius: 0;*/
-    background: none;
+/*    background: none;*/
-    box-shadow: none;
+/*    box-shadow: none;*/
-    margin-bottom: 20px;
+/*    margin-bottom: 20px;*/
-    padding: 0;
+/*    padding: 0;*/
-    text-align: unset;
+/*    text-align: unset;*/
-    position: unset;
+/*    position: unset;*/
-    height: unset;
+/*    height: unset;*/
-    direction: initial;
+/*    direction: initial;*/
-}
+/*}*/
 .menu_profile>div>a{
     font-size: 12px;
     line-height: 13px;
@@ -2442,8 +2487,122 @@
     transition: 200ms;
 }
 
+/* news rewrite*/
+.news_block{
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    justify-content: center;
+}
 
 
+.cont_one_news{
+    width: 300px;
+    display: block;
+    text-decoration: none;
+    color: #000000;
+    margin: 20px;
+    background: #FFFFFF;
+    box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
+    padding: 15px;
+    border-radius: 10px;
+}
+
+.cont_img_one_news{
+    height: 205px;
+    overflow: hidden;
+}
+
+.img_one_news{
+    display: block;
+    aspect-ratio: 4/3;
+    height: 225px;
+    object-fit: cover;
+}
+
+.cont_content_one_news{
+    height: calc(100% - 340px);
+}
+
 /*.subscribe_type_txt .f-r{*/
 /*    color: #FF613A;*/
 /*}*/
+
+
+.container_descript_one_news{
+    width: 100%;
+    overflow-wrap: break-word;
+}
+
+.container_name_one_news{
+    width: 100%;
+    overflow-wrap: break-word;
+    font-weight: 600;
+    padding-bottom: 20px;
+}
+
+/* checkbox type transport*/
+
+.checkbox_type_transport{
+    width: 100%;
+    display: block;
+    margin-bottom: 25px;
+}
+
+
+
+.input_f_checkbox_type_transport{
+    display: none;
+}
+
+.label_f_checkbox_type_transport{
+    width: 100%;
+    display: block;
+}
+
+.trigger_f_type_transport{
+    width: 30px;
+    height: 30px;
+    border: 1px solid #E6E6E6;
+    float: left;
+    border-radius: 10px;
+}
+
+.input_f_checkbox_type_transport:checked + label > .trigger_f_type_transport{
+    background: #FF613A;
+}
+
+.img_f_checkbox_type_transport{
+    display: inline-block;
+    padding-top: 11px;
+    padding-left: 5px;
+    width: 12px;
+}
+
+.span_f_checkbox_type_transport{
+    color: #000000;
+    float: right;
+    display: block;
+    width: calc(100% - 55px);
+    padding-left: 5px;
+    padding-top: 5px;
+
+}
+
+.block_overlay.show.routes{
+    display: none;
+}
+
+.menu_buttons.left.close.filters{
+    width: 294px;
+    background: #FFFFFF;
+    border-radius: 10px;
+    max-height: 83vh;
+    left: 0;
+    padding: 13px;
+    transition: 200ms;
+    /* position: fixed; */
+    float: left;
+    text-align: left;
+    top: 0;
+}

static/css/styles.css

@@ -977,7 +977,7 @@ input.deactive {
     margin-top: 7px;
     display: inline-block;
     position: relative;
-    left: 34%;
+    left: 29%;
 }
 
 .title_for_msg_by_email{
@@ -1107,7 +1107,7 @@ section.login>form>div>div:nth-child(5)>a {
 section.profile {
     /*padding: 60px 0;*/
     margin-bottom: 120px;
-    width: 75%;
+    width: 74%;
     float: left;
 }
 
@@ -1343,6 +1343,7 @@ h2.title_new_route{
 .errorlist>li{
     color:red;
     margin-left: 12px;
+    font-size: 14px;
 }
 span.errorlist{
     color: red;
@@ -1825,7 +1826,7 @@ input#id_extra_phone
 button#edit_route {
   display: block;
   height: 44px;
-  width: 98%;
+  width: 100%;
   background: #FF613A;
   color: #FFF;
   font-family: Inter;
@@ -1840,7 +1841,9 @@ button#edit_route {
 }
 
 .button_remove_route {
-  display: inline-block;
+    display: inline-block;
+    width: 100%;
+    text-align: center;
 }
 
 
@@ -1849,7 +1852,7 @@ button#remove_route {
   width: 285px;
 }
 button.confirm_remove{
-    width: 49% !important;
+    width: 49.5%;
     border: 1px solid #ff0000a8;
     border-radius: 10px;
     color: #ff0000a8;
@@ -1858,10 +1861,11 @@ button.confirm_remove{
     margin-right: 3px;
     /*padding: 5px 0px 5px 0px;*/
     font-size: 16px;
+    height: 44px;
 }
 
 button.cancel_remove{
-    width: 48%;
+    width: 49.5%;
     border: 1px solid #808080cc;
     border-radius: 10px;
     color: #808080cc;
@@ -1869,6 +1873,7 @@ button.cancel_remove{
     font-weight: 600;
     /*padding: 5px 0px 5px 0px;*/
     font-size: 16px;
+    height: 44px;
 
 }
 
@@ -2629,7 +2634,7 @@ details[open] summary ~ *{
 }
 
 .news_item {
-    width: 413px;
+    width: 48%;
     margin-bottom: 2%;
     background-color: white;
     filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20));
@@ -2655,9 +2660,10 @@ details[open] summary ~ *{
 
 .news_img>img{
     object-fit: cover;
-    height: 240px;
+    width: 100%;
-    width: 370px;
     border-radius: 10px;
+    aspect-ratio: 4 / 3;
+    max-height: 300px;
 }
 
 

static/js/filters_functions_find_route.js

@@ -92,12 +92,11 @@ function ajax_for_filter (data_d,get_url){
             let new_page_routes = document.createElement("div")
             new_page_routes.classList.add("page_paging_elements_" + page_iterator)
             let insert_place_main = document.querySelector(".block-finded-routes")
-            if (insert_place_main){
+            if (insert_place_main) {
                 insert_place_main.innerHTML = ''
                 insert_place_main.appendChild(new_page_routes)
             }
-
+            //             // $(new_page_routes).insertAfter(".page_pagingelements_" + old_page_iterator);
-            // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
             // let line_separator = document.createElement("div")
             // line_separator.classList.add("line_separator_page_w_el")
             // $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);

static/js/user_profile.js

@@ -509,6 +509,23 @@ function sendRoute(el, routeID = null){
             // location.href = '/profile'
             document.querySelector(".info_profile").innerHTML = data.html
 
+            // let dataset = document.querySelector(`[data-number-of-route=${"routeID"}]`)
+
+
+            // let el_route_id = document.querySelector(`[data-number-of-route="${routeID}"]`);
+            // let el_route = document.querySelectorAll(".carrier-card")
+
+            //
+            // let el_route_id = el_route.dataset.numberOfRoute;
+            // if(el_route_id){
+            //     el_route.scrollIntoView(true);
+            // }
+
+
+
+            // document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'});
+
+
             let list_div = document.querySelectorAll('.menu_profile div');
             let my_routes = document.getElementById("my_routes_id")
             list_div.forEach(el=>{ el.classList.remove('selected'); });

static/js/user_profile_2.js

@@ -779,7 +779,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
             handler_text.style.fontSize = '13px'
         } else {
             handler_text.innerHTML = curtain_name
-            handler_text.style.fontSize = '16px'
+            handler_text.style.fontSize = '13px'
         }
 
         if (!curtain.classList.contains('open')){

templates/blocks/b_find_route_form.html

@@ -10,7 +10,7 @@
         {% if show_filter_and_results %}
             <div class="block-find-route">
 
-                {% include "forms/f_find_route_filters_form.html" %}
+{#                {% include "forms/f_find_route_filters_form.html" %}#}
 
                 <div class="block_w_paging routes">
 

templates/forms/f_find_route_filters_form.html

@@ -1,6 +1,6 @@
 {% load static %}
 
-<div class="block-filters-find-route">
+{#<div class="block-filters-find-route">#}
     <div class="title_filters_find_route">Все фильтры</div>
     <div class="methods_transportation_form_filters">
         <div class="title_el_methods_transportation">Способ перевозки</div>
@@ -16,19 +16,27 @@
 {#                    </div>#}
         {% for item in route_form.fields.type_transport.choices %}
             {% if forloop.counter0 > 0 %}
-                <div>
+{#                <div>#}
-                    <input
+{#                    <input#}
-                        class="custom-checkbox el_form_find_route"
+{#                        class="custom-checkbox el_form_find_route"#}
-                        type="checkbox"
+{#                        type="checkbox"#}
-                        name="type_transport"
+{#                        name="type_transport"#}
-                        id="id_cargo_type_car_{{ forloop.counter }}"
+{#                        id="id_cargo_type_car_{{ forloop.counter }}"#}
-                        onchange="filters_func_find_route_main(this,'{{ owner_type }}')"
+{#                        onchange="filters_func_find_route_main(this,'{{ owner_type }}')"#}
-                        value="{{ item.0 }}"
+{#                        value="{{ item.0 }}"#}
-                    />
+{#                    />#}
-
+{##}
-                    <label for="id_cargo_type_car_{{ forloop.counter }}" >
+{#                    <label for="id_cargo_type_car_{{ forloop.counter }}" >#}
-                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">
+{#                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">#}
-                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>
+{#                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>#}
+{#                    </label>#}
+{#                </div>#}
+                <div class="checkbox_type_transport">
+                    <input class="input_f_checkbox_type_transport el_form_find_route" type="checkbox" value="{{ item.0 }}" name="type_transport" id="id_cargo_type_car_{{ forloop.counter }}" onchange="filters_func_find_route_main(this,'{{ owner_type }}')">
+                    <label for="id_cargo_type_car_{{ forloop.counter }}" class="label_f_checkbox_type_transport">
+                        <div class="trigger_f_type_transport"></div>
+                        <img class="img_f_checkbox_type_transport" src="{% static "img/svg/Car.svg" %}">
+                        <span class="span_f_checkbox_type_transport">{{ item.1 }}</span>
                     </label>
                 </div>
             {% endif %}
@@ -86,4 +94,4 @@
         </select>
     </div>
 
-</div>
+{#</div>#}

templates/pages/p_main.html

@@ -239,20 +239,30 @@
 {##}
 {#        {% endfor %}#}
 {#        <div class="three_pinned_news">#}
+        <div class="news_block">
             {% for art in articles %}
-                <div class="news_item">
+                <a class="cont_one_news" href="{% url "article_one" art.url %}">
-                    <a href="{% url "article_one" art.url %}">
+                    <div class="cont_img_one_news">
-                        <div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
+                        <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
-                        <div class="news_header">{{ art.name }}</div>
+                    </div>
-                        <div class="news_description">
+                    <div class="cont_content_one_news">
-                            {{ art.description|truncatechars:100 }}
+                        <div class="container_name_one_news">
-                            <div class="news_gradient"></div>
+                            {{ art.name|truncatechars:100 }}
                         </div>
-                    </a>
+                        <div class="container_descript_one_news">
-                </div>
+                            {{ art.description|truncatechars:100 }}
-
+                        </div>
-              {#<div>{{ art.text|safe }}</div>#}
+                    </div>
+                </a>
             {% endfor %}
+        </div>
+
+
+{#            {% url "article_one" art.url %}#}
+{#            {{ MEDIA_URL }}{{ art.picture }}#}
+{#            {{ art.description|truncatechars:100 }}#}
+
+
 
 {#        </div>#}
     </div>

templates/tb_base.html

@@ -42,7 +42,8 @@
     <script src="{% static "js/dynamic_loading_routes.js" %}"></script>
     <script src="{% static "js/user_profile.js" %}"></script>
     <script src="{% static "js/user_profile_2.js" %}"></script>
-
+    <script src="{% static "js/ion.rangeSlider.min.js" %}"></script>
+    <link rel="stylesheet" href="{% static "css/ion.rangeSlider.min.css" %}">
 
 
 {#    <script src="{% static "js/range_calendar.js" %}"></script>#}
@@ -53,7 +54,7 @@
 </head>
 <body>
 
-<div class="block_overlay  {% if page_type == 'profile' %}show{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
+<div class="block_overlay  {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} show routes n_profile{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
 <div class="wrapper_main">
 
     {% include 'blocks/b_header.html' %}
@@ -70,6 +71,20 @@
                 </div>
             </div>
         </div>
+    {% if page_type == 'routes' %}
+        <div class="cut_width_f_curtain left">
+            <div class="menu_buttons curtain left open filters" data-name="Фильтры">
+
+                {% include "forms/f_find_route_filters_form.html" %}
+                <div class="handler_menu close" onclick="open_curtain('left')">
+                    <img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
+                    <div class="text_f_curtain left">Фильтры</div>
+                    <img class="btns_f_curtain close right"  src="{% static 'img/svg/arrow_f_curtain.svg' %}">
+                    <div class="clear_both"></div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
     <div class="wrapper_content">
 
         {% block content %}