Просмотр исходного кода

split threads.urls into single module

Rafał Pitoń 10 лет назад
Родитель
Сommit
fe3958427d

+ 6 - 2
misago/templates/misago/user_nav.html

@@ -71,9 +71,13 @@
   </li>
   {% endif %}
   <li>
-    <a href="#" class="tooltip-bottom" title="{% trans "Private threads" %}">
+    <a href="#" class="tooltip-bottom" {% if user.unread_private_threads %}
+        title="{% blocktrans with unread=user.unread_private_threads count counter=user.unread_private_threads %}{{ unread }} unread private threads{% plural %}{{ unread }} unread private thread{% endblocktrans %}"
+        {% else %}
+        title="{% trans "Private threads" %}"
+        {% endif %}>
       <span class="fa fa-inbox fa-fw"></span>
-      <span class="badge">47</span>
+      <span class="badge fade {{ user.unread_private_threads|iftrue:"in" }}" data-misago-badge="private_threads">{{ user.unread_private_threads }}</span>
     </a>
   </li>
   <li class="user-notifications-nav dropdown">

+ 10 - 0
misago/threads/urls/__init__.py

@@ -0,0 +1,10 @@
+# flake8: noqa
+from misago.threads.urls import events, posts, privatethreads, threads
+
+
+urlpatterns = []
+
+urlpatterns += events.urlpatterns
+urlpatterns += posts.urlpatterns
+urlpatterns += privatethreads.urlpatterns
+urlpatterns += threads.urlpatterns

+ 7 - 0
misago/threads/urls/events.py

@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, include, url
+from misago.threads.views.events import EventsView
+
+
+urlpatterns = patterns('',
+    url(r'^edit-event/(?P<event_id>\d+)/$', EventsView.as_view(), name='edit_event'),
+)

+ 13 - 0
misago/threads/urls/posts.py

@@ -0,0 +1,13 @@
+from django.conf.urls import patterns, include, url
+from misago.threads.views.post import (QuotePostView, ApprovePostView,
+                                       HidePostView, UnhidePostView,
+                                       DeletePostView)
+
+
+urlpatterns = patterns('',
+    url(r'^post/(?P<post_id>\d+)/quote/$', QuotePostView.as_view(), name='quote_post'),
+    url(r'^post/(?P<post_id>\d+)/approve/$', ApprovePostView.as_view(), name='approve_post'),
+    url(r'^post/(?P<post_id>\d+)/unhide/$', UnhidePostView.as_view(), name='unhide_post'),
+    url(r'^post/(?P<post_id>\d+)/hide/$', HidePostView.as_view(), name='hide_post'),
+    url(r'^post/(?P<post_id>\d+)/delete/$', DeletePostView.as_view(), name='delete_post'),
+)

+ 1 - 0
misago/threads/urls/privatethreads.py

@@ -0,0 +1 @@
+urlpatterns = []

+ 0 - 19
misago/threads/urls.py → misago/threads/urls/threads.py

@@ -41,18 +41,6 @@ urlpatterns += patterns('',
 )
 
 
-from misago.threads.views.post import (QuotePostView, ApprovePostView,
-                                       HidePostView, UnhidePostView,
-                                       DeletePostView)
-urlpatterns += patterns('',
-    url(r'^post/(?P<post_id>\d+)/quote/$', QuotePostView.as_view(), name='quote_post'),
-    url(r'^post/(?P<post_id>\d+)/approve/$', ApprovePostView.as_view(), name='approve_post'),
-    url(r'^post/(?P<post_id>\d+)/unhide/$', UnhidePostView.as_view(), name='unhide_post'),
-    url(r'^post/(?P<post_id>\d+)/hide/$', HidePostView.as_view(), name='hide_post'),
-    url(r'^post/(?P<post_id>\d+)/delete/$', DeletePostView.as_view(), name='delete_post'),
-)
-
-
 # new threads list
 from misago.threads.views.newthreads import NewThreadsView, clear_new_threads
 urlpatterns += patterns('',
@@ -84,10 +72,3 @@ urlpatterns += patterns('',
     url(r'^moderated-content/sort-(?P<sort>[\w-]+)$', ModeratedContentView.as_view(), name='moderated_content'),
     url(r'^moderated-content/sort-(?P<sort>[\w-]+)(?P<page>\d+)/$', ModeratedContentView.as_view(), name='moderated_content'),
 )
-
-
-# events moderation
-from misago.threads.views.events import EventsView
-urlpatterns += patterns('',
-    url(r'^edit-event/(?P<event_id>\d+)/$', EventsView.as_view(), name='edit_event'),
-)