Merge remote-tracking branch 'origin/main'

ReferenceDataApp/admin.py

@@ -61,8 +61,8 @@ class Admin_Airport(Admin_Trans_BaseModel):
         'order', 'modifiedDT', 'createDT']
     search_fields = ['id', 'name_en', 'name_ru', 'city__name', 'city__country__name', 'iata_code', 'icao_code', 'international_name']
     list_filter = ['city__country']
-    raw_id_fields = [
+    # raw_id_fields = [
-        'city'
+    #     'city'
-    ]
+    # ]
 
 admin.site.register(Airport, Admin_Airport)

static/css/mobile_styles.css

@@ -1400,6 +1400,25 @@
           width: 490px;
           margin: 0 auto 30px;
     }
+
+    .news_item_pagination{
+          width: 490px;
+      }
+    .pag_news_img{
+            width: unset;
+    }
+
+    .news_item_pagination.odd .pag_news_img, .news_item_pagination.odd .pag_news_item_text{
+        float: unset;
+
+    }
+    .news_item_pagination.even .pag_news_img, .news_item_pagination.even .pag_news_item_text{
+        float: unset;
+    }
+
+    .pag_news_item_text{
+        width: unset;
+    }
 }
 @media (max-width: 850px){
 
@@ -1635,6 +1654,10 @@
         display: block;
     }
 
+    .news_item_pagination{
+        width: 100%;
+    }
+
     .previous_next_news>.news_item_static{
         margin: unset;
         margin-bottom: 40px;

static/css/styles(boris).css

@@ -2334,11 +2334,11 @@
 /*p_main news*/
 
 .news_description{
-    /*background: linear-gradient(45deg, #040404 33%, #c5c5c5 66%, #ffffff);*/
-    /*-webkit-background-clip: text;*/
-    /*-webkit-text-fill-color: transparent;*/
     font-size: 16px;
     font-weight: 400;
+    background: linear-gradient(180deg, #040404 46%, #ffffff 72%, #ffffff);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
 }
 
 .menu_buttons.right.close{

static/css/styles.css

@@ -1904,6 +1904,14 @@ button#edit_route {
     margin-left: 5px;
 }
 
+.pag_news_img>img{
+    object-fit: cover;
+    width: 100%;
+    border-radius: 10px;
+    aspect-ratio: 4 / 3;
+    max-height: 300px;
+}
+
 #error_footer.hide{
     display: none;
 }
@@ -2947,6 +2955,7 @@ details[open] summary ~ *{
     font-style: normal;
     font-weight: 600;
     line-height: 20px;
+    margin-bottom: 20px;
 }
 .self_news_header{
     font-size: 24px;
@@ -2956,7 +2965,7 @@ details[open] summary ~ *{
     margin-bottom: 40px;
 }
 .self_news_description{
-    margin-bottom: 40px;
+    margin-bottom: 20px;
 }
 
 .self_news_text>p+img{
@@ -2972,6 +2981,7 @@ details[open] summary ~ *{
     float: right;
     width: 40%;
     margin-left: 20px;
+    margin-bottom: 20px;
 }
 
 

templates/pages/p_article.html

@@ -15,9 +15,14 @@
 
     <div class="self_news">
 
-        <div class="self_news_header">{{ page.name }}</div>
+
-        <div><img class="self_news_img" src="{{ MEDIA_URL }}{{ page.picture }}" /></div>
+                <div><img class="self_news_img" src="{{ MEDIA_URL }}{{ page.picture }}" /></div>
-        <div class="self_news_description">{{ page.description }}</div>
+
+        <div class="self_news_wrapper">
+             <div class="self_news_header">{{ page.name }}</div>
+             <div class="self_news_description">{{ page.description }}</div>
+        </div>
+
         <div class="self_news_text">{{ page.text|safe }}</div>
     </div>