Некоторые хотфиксы.

Author: roman

play_murmansk/board/templates/board/board_list.html

@@ -4,7 +4,7 @@
 {% block title %}Продам Куплю Обменяю - PLAYSTATION и XBOX в Мурманске{% endblock %}
 
 {% block content %}
-<td valign="top" style="padding:0px 10px 0px 10px;"><table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tbody><tr>
 <td width="80%"><a class="m" href="https://web.archive.org/web/20100907080651/http://play-murmansk.ru/">Главная</a> » Доска объявлений (<b>119</b>)</td>
 <td align="right" style="white-space: nowrap;"></td>
@@ -47,5 +47,4 @@
     {% endfor %}
     </div>
     {% include "pagination.html" %}
-</td>
 {% endblock %}

play_murmansk/board/views.py

@@ -1,4 +1,4 @@
-from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView
+from django.views.generic import ListView, DetailView, CreateView
 from django.db.models import Count
 from django.urls import reverse
 from django.contrib.auth.decorators import login_required

play_murmansk/core/templatetags/custom_filters.py

@@ -14,4 +14,15 @@ def strip_p_tags_for_news_list(value):
 
 @register.filter
 def get_item(dictionary, key):
-    return dictionary.get(key[0])
+    return dictionary.get(key[0])
+
+@register.filter
+def translate_category(key):
+    categories = {
+        'SELL': 'ПРОДАМ',
+        'BUY': 'КУПЛЮ',
+        'EXCHANGE': 'ОБМЕНЯЮ',
+        'VARIOUS': 'РАЗНОЕ',
+        'SERVICES': 'УСЛУГИ',
+    }
+    return categories.get(key, None)

play_murmansk/links/templates/links/link_list.html

@@ -15,14 +15,11 @@
    <tbody>
    {% for category_link in link_category_list %}
       <tr>
-         <td style="width:100%" class="catsTd" id="cid1" valign="top"><a href="https://web.archive.org/web/20100907080651/http://play-murmansk.ru/board/1" class="catName">{{ category_link.0 }}</a> <span class="catNumData" style="unicode-bidi:embed;">[59]</span></td>
+         <td style="width:100%" class="catsTd" id="cid1" valign="top"><a href="{% url 'links' %}?category={{ category_link.0 }}" class="catName">{{ category_link.0 }}</a> <span class="catNumData" style="unicode-bidi:embed;">[{{ link_category_counts|get_item:category_link|default:0 }}]</span></td>
       </tr>
    {% endfor %}
    </tbody>
 </table>
-<hr>
-<span class="pagesBlockuz1"><b class="swchItemA"><span>1</span></b> <a class="swchItem" href="javascript://" rel="nofollow" onclick="spages('2');return false;"><span>2</span></a> <a class="swchItem" href="javascript://" rel="nofollow" onclick="spages('3');return false;"><span>3</span></a>  <a class="swchItem" href="javascript://" rel="nofollow" onclick="spages('2');return false;"><span>»</span></a></span>
-<hr>
 <div id="myGrid" style="display:none;"><div style="position:fixed;width:100%;text-align:center;padding-top:250px;"><img alt="" src="https://web.archive.org/web/20100907080651im_/http://s28.ucoz.net/img/ma/m/i3.gif" border="0" width="220" height="19"></div></div>
     <div id="allEntries">
         {% for links in link_list %}
@@ -42,7 +39,5 @@
         </div></td></tr></tbody></table><br></div>
     {% endfor %}
     </div>
-    <hr>
     {% include "pagination.html" %}
-<hr>
 {% endblock %}

play_murmansk/links/views.py

@@ -8,15 +8,30 @@ class LinkListView(ListView):
     model = Link
     template_name = 'links/link_list.html'
     context_object_name = 'link_list'
+    paginate_by = 10
 
     def get_queryset(self):
+        category_filter = self.request.GET.get('category')
+
         queryset = Link.objects.annotate(
             comments_count=Count('comments')
         ).order_by('-id')
+        if category_filter:
+            queryset = queryset.filter(category=category_filter)
         return queryset
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+
+        category_counts = Link.objects.values('category').annotate(
+            count=Count('id')
+        )
+
+        # Преобразование в словарь
+        category_counts_dict = {item['category']: item['count'] for item in category_counts}
+
+        # Добавление в контекст
+        context['link_category_counts'] = category_counts_dict
         context['link_category_list'] = LinkCategory.choices
         return context
 

play_murmansk/templates/base.html

@@ -1,5 +1,6 @@
 {% extends "index.html" %}
 {% load static %}
+{% load custom_filters %}
 {% block center %}
 <div id="centerBlock1">
             <!-- Body -->
@@ -182,7 +183,7 @@
                                              <table border="0" cellpadding="2" cellspacing="1" width="100%" class="infTable">
                                                 <tbody>
                                                    <tr>
-                                                      <td class="infTitle" colspan="2"> <span style="font-size: 7pt" ;=""> {{ board.category }} от {{ board.author }} </span>  <br> <a class="ma" href="20110828124907/http://play-murmansk.ru/board/">{{ board.title }}</a></td>
+                                                      <td class="infTitle" colspan="2"> <span style="font-size: 7pt" ;=""> {{ board.category|translate_category }} от {{ board.author }} </span>  <br> <a class="ma" href="20110828124907/http://play-murmansk.ru/board/">{{ board.title }}</a></td>
                                                    </tr>
                                                 </tbody>
                                              </table>