0001-review-backoffice-homepage-and-announce-management-1.patch

Serghei Mihai (congés, retour 15/05), 11 septembre 2016 20:01

Voir les différences: en ligne côte à côte

Subject: [PATCH] review backoffice homepage and announce management (#12908)

 corbo/manage_urls.py                       |   7 +-
 corbo/models.py                            |   6 ++
 corbo/static/css/corbo.css                 |  59 +++++++++----
 corbo/templates/corbo/category_detail.html |  44 ++++++++++
 corbo/templates/corbo/manage.html          | 133 ++++++++---------------------
 corbo/views.py                             |  60 ++++++-------
 6 files changed, 167 insertions(+), 142 deletions(-)
 create mode 100644 corbo/templates/corbo/category_detail.html

     from django.conf.urls import patterns, include, url
     from .views import add_announce, edit_announce, delete_announce, \
         add_category, edit_category, delete_category, manage, menu_json
         add_category, edit_category, view_category, delete_category, manage, \
         add_announce_for_category, menu_json
     urlpatterns = patterns('',
                 url(r'^$', manage, name='manage'),
-...
                     name='edit_announce'),
                 url(r'^announce/delete/(?P<pk>\d+)$', delete_announce,
                     name='delete_announce'),
                 url(r'^category/(?P<pk>\d+)/$', view_category,
                     name='view_category'),
                 url(r'^category/(?P<pk>\d+)/announce/$', add_announce_for_category,
                     name='add_announce_for_category'),
                 url(r'^category/add$', add_category,
                     name='add_category'),
                 url(r'^category/edit/(?P<pk>\d+)$', edit_category,

         def __unicode__(self):
             return self.name
         def get_announces_number(self):
             return self.announce_set.all().count()
         def get_subscriptions_number(self):
             return self.subscription_set.all().count()
     class Announce(models.Model):
         category  = models.ForeignKey('Category', verbose_name=_('category'))

     a:link, a:visited, a:hover {
         text-decoration: none;
         color: #000;
+    }
     header h1 {
-...
     #management ul li {
         padding: 5px;
         border: 1px solid #aaa;
         background: #eee;
         margin:2px 0;
         border-radius: .3em;
         position: relative;
+    }
-...
         margin: .4em 0;
+    }
     .title {
         font-size: .9em;
         font-weight: bold;
+    }
     .preview {
         padding-left: 10px;
         font-size: .8em;
-...
         right: 5px;
+    }
     ul.objects-list.single-links li .actions a {
         color: #999;
         display: inline;
         padding: 0;
+    }
     .actions a:hover {
         color: #333;
+    }
     .status {
         position: absolute;
         padding: 2px;
-...
     .status .icon {
         color: #888;
         font-size: 0.9em;
+    }
     .status .published:before {
-...
+    }
     #management .datetime {
         width: 15%;
         float: right;
         margin-right: 35px;
         position: absolute;
         top: 3px;
         right: 0;
         width: 25%;
+    }
     .empty {
-...
         clear: both;
+    }
     .subscriptions_number {
         font-size: 0.8em;
     .categories-listing {
         -webkit-column-width: 13em;
         -moz-column-width: 13em;
         column-width: 13em;
+    }
     .categories-listing div.category {
         border-radius: 0.3em;
         display: table;
         min-width: 10em;
         position: relative;
         padding:6px;
         margin-bottom: 10px;
         background:#f6f6f6;
         color:#505050;
         border: 1px solid #e4e4e4;
+    }
     div.title {
         line-height:1.5em;
+    }
     div.category .creation_date, div.category .infos {
         font-size: 0.7em;
+    }
     .category .infos {
         margin: 5px 0 0 0;
         float: right;
+    }
+    }

     {% extends 'corbo/manage.html' %}
     {% load i18n %}
     {% block appbar %}
     <h2>{% trans "Category:" %} {{ object.name }}</h2>
     <a href="{% url 'delete_category' object.id %}" rel="popup">{% trans 'Delete' %}</a>
     <a href="{% url 'edit_category' object.id %}" rel="popup">{% trans 'Rename' %}</a>
     <a href="{% url 'add_announce_for_category' pk=object.pk %}" rel='popup'>{% trans 'New announce' %}</a>
     {% endblock %}
     {% block content %}
     <div id="management">
     <ul class='objects-list single-links'>
     {% for announce in announces %}
     <li>
       <div class="status">
         {% if announce.is_published %}
         <span class="icon published" title="{% trans "published" %}"></span>
         {% endif %}
         {% if not announce.is_published %}
         {% if announce.is_expired %}
         <span class="icon expired" title="{% trans "expired" %}"></span>
         {% else %}
         <span class="icon unpublished" title="{% trans "not published yet" %}"></span>
         {% endif %}
         {% endif %}
       </div>
       <a href="{% url 'edit_announce' announce.id %}" rel='popup'>{{ announce.title }}</a>
       <div class="datetime">
         {% blocktrans with mtime=announce.mtime|date:'DATETIME_FORMAT' %}
         Modified on {{ mtime }}
         {% endblocktrans %}
       </div>
       <div class="actions">
         <span><a class="icon delete" href="{% url 'delete_announce' announce.id %}" rel="popup"></a></span>
       </div>
     </li>
     {% empty %}
     <div class="empty">
       {% trans "No announces yet." %}
     </div>
     {% endfor %}
     </ul>
     {% endblock %}

     {% extends 'corbo/base.html' %}
     {% load i18n static %}
     {% load i18n %}
     {% block page-title %}
     {{ block.super }} :: {% trans "Management" %}
     {% endblock %}
     {% block appbar %}
     <h2>{% trans "Categories" %}</h2>
     <a href="{% url 'add_category' %}" rel='popup'>{% trans 'New category' %}</a>
     <a href="{% url 'add_announce' %}" rel='popup'>{% trans 'New announce' %}</a>
     {% endblock %}
     {% block content %}
     <div class="categories">
       <span class="title">{% trans "Category:" %}</span>
       <select>
         <option value=''>{% trans "All" %}</option>
         {% for category in categories %}
         <option value='{{ category.id }}'{% if category_id == category.id %} selected{% endif %}>{{ category }}</option>
         {% endfor %}
       </select>
       <span>
         {% if category_id %}
         <a class="icon edit" href="{% url "edit_category" category_id %}" rel="popup" title="{% trans "edit category" %}"></a>
         <a class="icon delete" href="{% url "delete_category" category_id %}" rel="popup" title="{% trans "delete category" %}"></a>
         {% endif %}
         <a class="icon add" href="{% url "add_category" %}" rel="popup" title="{% trans "add category" %}"></a></span>
     </div>
     <div id="management">
       <h4>{% trans "Announces" %}</h4>
       <span><a class="icon add" href="{% url "add_announce" %}">{% trans "add announce" %}</a></span>
       <div>
         <span class="subscriptions_number">
         {% blocktrans count n=subscriptions_number %}
         {{ n }} subscription
         {% plural %}
         {{ n }} subscriptions
         {% endblocktrans %}
         </span>
       </div>
       <div class="clear"></div>
     <ul>
     {% for obj in object_list %}
     <li class='{% cycle 'bluesky' '' %}'>
       <div class="status">
         {% if obj.is_published %}
         <span class="icon published" title="{% trans "published" %}"></span>
         {% endif %}
         {% if not obj.is_published %}
         {% if obj.is_expired %}
         <span class="icon expired" title="{% trans "expired" %}"></span>
         {% else %}
         <span class="icon unpublished" title="{% trans "not published yet" %}"></span>
         {% endif %}
         {% endif %}
       </div>
       <div class="preview datetime">
         {% blocktrans with mtime=obj.mtime|date:'DATETIME_FORMAT' %}
         Modified on {{ mtime }}
         {% endblocktrans %}
       </div>
       <div class="actions">
         <span><a class="icon edit" href="{% url 'edit_announce' obj.id %}"></a></span>
         <span><a class="icon delete" href="{% url 'delete_announce' obj.id %}" rel="popup"></a></span>
       </div>
       <div class="announce">
         <div class="title">{{ obj.title }}</div>
         <div class="preview">{{ obj.text|safe|truncatechars_html:128 }}</div>
       </div>
     </li>
     {% empty %}
     <div class="empty">
       {% trans "No announces matching this category" %}
     </div>
     {% endfor %}
     </ul>
     {% if is_paginated %}
     <ul class="pagination">
       {% if page_obj.has_previous %}
       <li class="prev">
         <a href="?{% if category_id %}category={{ category_id}}&{% endif %}page={{ page_obj.previous_page_number }}" class="icon"></a>
       </li>
       {% endif %}
       <li class="current">
         page {{ page_obj.number }} of {{ paginator.num_pages }}
       </li>
       {% if page_obj.has_next %}
       <li class="next">
         <a href="?{% if category_id %}category={{ category_id}}&{% endif %}page={{ page_obj.next_page_number }}" class="icon"></a>
       </li>
       {% endif %}
     </ul>
     {% endif %}
       <ul class='objects-list single-links'>
         {% for obj in object_list %}
         <li class='category'>
             <a href="{% url 'view_category' pk=obj.id %}">{{ obj.name }} /
             {% blocktrans with creation_date=obj.ctime|date:"SHORT_DATETIME_FORMAT" %}
             created on {{ creation_date }}
               {% endblocktrans %} /
               {% blocktrans count announces_number=obj.get_announces_number %}
               {{ announces_number }} announce
               {% plural %}
               {{ announces_number }} announces
               {% endblocktrans %} /
               {% blocktrans count subscriptions_number=obj.get_subscriptions_number %}
               {{ subscriptions_number }} subscription
               {% plural %}
               {{ subscriptions_number }} subscriptions
               {% endblocktrans %}
             </a>
           <div class="actions">
             <a class="icon edit" href="{% url 'edit_category' obj.id %}" rel="popup"></a>
             <a class="icon delete" href="{% url 'delete_category' obj.id %}" rel="popup"></a>
           </div>
         </li>
         {% empty %}
         <div class="empty">
           {% trans "No categories yet." %}
         </div>
         {% endfor %}
       </ul>
     </div>
     {% endblock %}
     {% block page-end %}
     <script type="text/javascript">
       $(function() {
         $('div.categories select').on('change', function() {
             var category = $(this).val();
             if (category)
                 window.location.replace('{% url "manage" %}?category=' + category);
             else
                 window.location.replace({% url "manage" %});
         })
     })
     </script>
     {% endblock %}
       {% endblock %}

     from django.core import signing
     from django.core.urlresolvers import reverse
     from django.views.generic import CreateView, UpdateView, DeleteView, \
                                      ListView, TemplateView, RedirectView
                                      ListView, TemplateView, RedirectView, \
                                      DetailView
     from django.contrib.syndication.views import Feed
     from django.shortcuts import resolve_url
     from django.utils.encoding import force_text
-...
         template_name = 'corbo/announce_form.html'
         def get_success_url(self):
             """
             redirect to the category page of the new created announce
             """
             return reverse('manage') + '?' + urlencode({'category': self.object.category.id})
             return reverse('view_category', kwargs={'pk': self.object.category.pk})
     add_announce = AnnounceCreateView.as_view()
     class AnnounceForCategoryCreateView(AnnounceCreateView):
         def get_initial(self):
             initial = super(AnnounceForCategoryCreateView, self).get_initial()
             initial['category'] = models.Category.objects.get(pk=self.kwargs['pk'])
             return initial
     add_announce_for_category = AnnounceForCategoryCreateView.as_view()
     class AnnounceEditView(UpdateView):
         model = models.Announce
         form_class = AnnounceForm
         def get_success_url(self):
             return reverse('manage') + '?' + urlencode({'category': self.object.category.id})
             return reverse('view_category', kwargs={'pk': self.object.category.pk})
     edit_announce = AnnounceEditView.as_view()
-...
     add_category = CategoryCreateView.as_view()
     class CategoryEditView(UpdateView):
         form_class = CategoryForm
         model = models.Category
         def get_success_url(self):
             return self.request.META['HTTP_REFERER'] or \
                 reverse('manage') + '?' + urlencode({'category': self.object.id})
             return reverse('view_category', kwargs={'pk': self.object.pk})
     edit_category = CategoryEditView.as_view()
     class CategoryView(DetailView):
         model = models.Category
         def get_context_data(self, **kwargs):
             context = super(CategoryView, self).get_context_data(**kwargs)
             context['announces'] = self.object.announce_set.all()
             return context
     view_category = CategoryView.as_view()
     class CategoryDeleteView(DeleteView):
         model = models.Category
-...
     class ManageView(ListView):
         paginate_by = settings.ANNOUNCES_PER_PAGE
         template_name = 'corbo/manage.html'
         model = models.Announce
         def get_queryset(self):
             queryset = super(ManageView, self).get_queryset()
             if self.request.GET.get('category'):
                 queryset = queryset.filter(category__id=self.request.GET['category'])
             return queryset
         def get_context_data(self, **kwargs):
             context = super(ManageView, self).get_context_data(**kwargs)
             context['categories'] = models.Category.objects.all().order_by('-ctime')
             context['subscriptions_number'] = models.Subscription.objects.count()
             if self.request.GET.get('category'):
                 try:
                     context['category_id'] = int(self.request.GET['category'])
                     cat = models.Category.objects.get(pk=context['category_id'])
                     context['subscriptions_number'] = cat.subscription_set.count()
                 except (ValueError, models.Category.DoesNotExist):
                     pass
             return context
         model = models.Category
     manage = ManageView.as_view()
     class Atom1Feed(DjangoAtom1Feed):
         def root_attributes(self):
             attrs = super(Atom1Feed, self).root_attributes()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Corbo

0001-review-backoffice-homepage-and-announce-management-1.patch