# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-04-01 15:07:12
# Node ID 389105b19c27bce60335940332b61b0df8959691
# Parent  8f4f78df4936fe062ead4abda6c0832546ab60ff

Show only required tags in all tags list by default

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index 276c48cea3ffc8b9eb795283871a1d8b0fb7e6e6..a2bde82e2a0f6f72f4ac7560905901da4f9e14b7
GIT binary patch
literal 6909
zc$|$_U2GiH6~43q;*G%}c78~q+yF^Q!!GLpC2ZmlCvg&k?HJpkf~vB{yAyk0J+qye
zHF1g5B(6y+rx;RND20a5syqOav#}F9cAN)9pQtq3m!ei`U+6<C`ci?~7pi{eoV!1c
z9f_4^zPUf=-1GCDGvmLmTK02=-&45m!1eLhl=>0y=#7ehM{ZVXEpQk}Q?CG*178EK
z0KN^xpL!p+n}CzR8sIE22K>mZN4VVv`~<if_)p+6I$*izyK%YbyA`+*xPG~;?*i5W
zTMTwB7dv{F%Q-es13lmd;LE_<fd!-QV}qXnZvlP^ycPIw;GMu5YDCXnxYYqS*NEMZ
z*2uoSz;6M&YedfrX8*|=(f3M?*m<@_{Qs>Pzi0GJ)QJDHX8(sZVt>)h|H+L1X3qb+
zk^92vp#kZ=F(z@U1*U+jW0J4VnCKY<t^(%G{!_rO1IJ_H$IoJ-?;YR{;Jar0DR2|;
zA2IQ7<qEOq4&XZA-N46y+gFI+FPQbw6%v;*;4a_=AgH50Um@rJ$L#+f@NP<Tt=PAv
zR?gp9D}KCCEBi0jihoyXMeg@zJ_0sSoNC3-&&<BhjlM5|YshW{_tFip3HTj~=dE(?
znmXa#qjeJBC+dVp->Vb<27q?~kJkxr&ee&&**cN`W1aZ<1#l(sPTal$Ostgsj{^??
zGb<%;ADH=R;Chl@Df<3p#>-&L9^xBt8!!#L5BTP7;^#-V2`~Q)+zk9L@LtNpD#^os
z;622@Rl@i8fZqiEVU_st88A*fsh4pIh(GmAz1ZQ_3m-=7C4R3Oe79cCyIe1E`Ltf@
z@XLCM*F6n_$p-PWsX_R6ph5K74Wj3$Ssyp!H-JMFmj?0o-qmvc_g9Pk+10Y|rPU&L
zZngOLz8OcrQ^3ENaR!GqQ@yVd|IV)wJ`{luQrv*Oz+2Z!-*VTA{uhBy0DlR5nd)q<
z=o?xmc|E>P^qm2A0}JaU4mTm0!;~-Jvm}4J$Sqqha&_y)e{JxQ_2O5@dO0^|a0GZi
z@E5>Gfgb{IQ1V-+DnF`;7A3XYVCFb(O8Vw4X3n%{&cSl?{7r+88>I6dGS9@>N0h{b
zej5yKGI(>94c}J6;SS0-uDxcS>YI85@$hal*Jki0g9%&*mE?F$mCl_?;;;`_yONsO
zW7a4yRI^)gbt;J~agFl1(d^le>wzkL#A%A-E?f_rIeLc?_jj8y)e-d?s{1FE)LEmF
zez45!(N#K|)WTo$HRJ6{dI9w(;z-QQQ(Ygz)l;>XYN@qqyhRDWh}&JPJd@EmF9>z$
z>2SaaaPw^|gZV+nRn6I~4z2z`9(V=M`EbDV1GU?7T|1+8d)bT*?IWSull1~yANKq~
zwZ|JAv|UU=B($|_KVMS3*9k)3>C1<9M(5p(?PI}KEg2`|8y#mJWPgi;b)OH=p0Axj
ztKZgxd05<MYaC(wb|#_r*|224mCf4zupaa>wmRTsGPcXsr&KFR$z31nYBNtIEm=Dt
zzb#j940PXcXa}m*wQ@P%%lQtOpB}J$D~+Q9?TE_6b$8Ipkd<{Za!`oJw1lV4!g2Xr
z2K!T5wK?u{6m*NjuR7p>wnErKyBf7`{~+(cH99SURd}BxA38ieQ1L85V-ATt(i{?i
zxXMs6rtKpLdP19IAfEcL<Kr05wKrg&KWJqoXdPZC;`HPkcG6bpcy6E$=4@AW(lII3
zN#@c`4pyDMJ>=NW3wrrL?0hosg|_Olb6E%BBpjBz5RFrdu@^X@=MSrHYsgmJw&kY>
z0Ac93AYJ!!PA-QKY`iZGo5IZjqQd$TnhY{(NMT^x8p$uOtL_})nSx|4mw_CG7<cd}
zW8tuz=YS}x8$^80h88d1KOi~k9(F_Pi0T0eap^(Jg)_|L9x4O6m1&c)v(BJHJnkFT
zLC#8(VLc0Y>ICIPCKN64O*9O^<%QI%kVv)##+U(EfV(51)fvwYw2Mq}T4e!=hr$33
zOHg`C5i3!^aw(1!hw>5!1!g&ew*DcgfTu8P?q9{k;T*PMk!(VV+6jHgl)uFZgte}n
zr3sMBM}jg#mYb%sCy|6Yl*1oYgMyr|T?<}**FxpvoWM?dE}4B8XXz}}1epu1>S-^p
zEvO^H`WD!e;HfkW3{m_!i?=b$xoME+IpJt&-nWB%He{nyB<$<fPMDYR$yEwtpACBT
zaeqVEct}G!WJ!zKB6To2SXtZ&RmKjSe%GdlAv^1VW=d*OJ!=hFLE3k6p{}f<A=qwU
zD-*jw2|GdKzWiX0Ii--#Mg(C99%g%=_xw!IOO3J9_nx)WVZ1dHe+oH3ZKiZ*^PVS~
z_qXV$TDrPh4|c?;s{AnC9`rkz`0jjv5byC)I@WoxC(aE3Lh-%agSI9cAC4y<iYFU&
z<F-`t;VsDrlSyohcOhCqW#7{+&0X>KgYmu1`oO_dd+U~G4tBJ}sGY@oe9H~86pWPK
zcc`sRcQm)R=p8NX&8=;_n)mMQYU%FYiLGvb9<IiFY-=#3+nPJ}A0m@?w6*QZItkD3
zuk1-_KObvvZEvY~*qBJhC<!RTII%9piG3iKwH$XlQ!=o_rb9jZ;@c|w$gsn<A8&Ef
zUIvLz>1};Z80*aD5z_cRurx?%H^;-E>A~$<9-HoSH#R1lni}<{O`0B)8=4v$^<z4z
zQ#{_;w6(Ofqv;`fWQpXC#-u)aR79{RxfwEzklDI<drU>IM)T46Xd)^^)5R0T)4F&Z
z6PPOgB$|q@MAOlfjtaW?Q!I|?;t5R76-QL`ax@vuVHG=y$FX({cnop{sA4G<oq;L{
z&qY%ZyBtlIW{i?CQc}QRzIcoVuR-#BGz%S<t97a9EFNczBhf{kzET{EW<<wjI#~oS
zlMb=}$D~k<d;^kmWB{a2L=$9WG^3((n7#!2Cs+XH;;7<C@ue#F-p1nb=qj0E+=D5_
zadHLYaUETS(4>l9hoU(N6e(LYQFfn{Ub|K~?wyi18Wzq*(;6{=x!6Dv#<PaGhyr2&
z|248B&LTtwh)%MHV+j@gs^lxVFhwDY=5%xc*3ZI@W0;yI|4ZQ-TaciXm`KSde=n8@
zpzyswhAmnuj$cQj%G_wa%3Se&3LDT#nRYXj!ME6ldBl5!f<Q*IX-EMc;UW=WjCfc!
zcA_|%_^N_tV}T<e{Gl(P=nY66<E@1yXmyrSPhrCeVl!6?vxTSGQ+zK)=O8eKDbCXs
z+!ogmEMNxn>L@gyAQB-is6^g5jxbK}@w3I#w2juw&L${nYzpxdYH7JbOl0CkO8Hx~
zpH465w>VnTg0f1Kb}W_4Xa>t~mZ(5}OtCZ3OclM%0nFQkt`ribk@jEZ5OXnYpxs=F
zL_YFKB7CewOV+mFh-h9#zcGZS!kw+K?AKgFrp77aRh}2eC<(OVDo+-wYjH6(uT2iA
zKg(uKmI@wcQ-+R}7hpO?{(5o$9i7POn-D_^+$hGX233!x&QMs;Z>G4VTw+c0Rh_Ch
zT0V=NqHZ`%DW>>M7+dBMLhi6<d2p3&<%m{&qLNR>0#F#~GeIS3P9Lj+xA*JfN!~>K
z1Z@#eN|3Qyy83*@OD5-KHd>nH>B{HrqDq+IDi%gjBH8O1=}z3rizk^wm$5#=9cp1!
zo}-RPfu;!xM1`~y#GVobW-G0zTt)Q4s^a(px-Z#YS=S}Dc2;UY3q{ZeXo@u=kc->*
zQUx}(WTkWb-l;fPrK@BU#H)H}DbgpUi&nQf%Igv#stO<liB6cKhYvW(GuIHBoV>zy
zA}nGtl(ew;9DfS1SUIpfn3B{l{>~SYBP7>;<uB$2BJnQ2c<0%l8Gg+c$0^D5lD|;$
zk(${OQ`banS_~||cZ#Qrr>+;XGd!5&>Ra3*BpNSKr$e@1r!ND3vz(4DAui?KH^J|T
zSvqhMKn<Qxm=cwA6u%J3>hgCAb78@^Q*k^Y2B8j$qi7uEw@$gQ&6Peu*ai_blp2>7
zG0BIO91@?210zs1DRJeOTh*g^&yjI5X+A$L5LeC+E#_D;mFI+XsYKPnMP`F2ELVxK
z%rp)rWuf}(r&Kkix{`PFbgBBLIKXgH+N+jggv{v_g=nI9ivB->(n;D3rc;?jv$Su?
zk4b)K6;Of~B`~B(li0+f&spOky@(W9Eki{iW$iN*EKEp`;QM)gYn;Reuye^*>~(hQ
z%70^u`Ul=BByfqCM?#AVWr-;!zkE~8AqBI{@M)>|atCaz>V~~!VlR7foQs&aM9~`U
JHDoQQ{{tFeEl>ae

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-30 18:42+0300\n"
+"POT-Creation-Date: 2015-04-01 18:05+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -255,21 +255,21 @@ msgstr "Создать новую тему"
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:143
+#: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:146
+#: templates/boards/posting_general.html:145
 #: templates/boards/thread_normal.html:51
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:158
+#: templates/boards/posting_general.html:157
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
+#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:21
 msgid "Preview"
 msgstr "Предпросмотр"
 
@@ -335,10 +335,11 @@ msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:18
+#: templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/staticpages/help.html:20
+#: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
@@ -346,6 +347,10 @@ msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 msgid "No tags found."
 msgstr "Метки не найдены."
 
+#: templates/boards/tags.html:26
+msgid "All tags"
+msgstr "Все метки"
+
 #: templates/boards/thread.html:32
 msgid "Last update: "
 msgstr "Последнее обновление: "
diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html
--- a/boards/templates/boards/base.html
+++ b/boards/templates/boards/base.html
@@ -31,7 +31,7 @@
         {% autoescape off %}
             {{ tags_str }},
         {% endautoescape %}
-        <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
+        <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}"
                 >[...]</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>.
 
diff --git a/boards/templates/boards/tags.html b/boards/templates/boards/tags.html
--- a/boards/templates/boards/tags.html
+++ b/boards/templates/boards/tags.html
@@ -9,7 +9,7 @@
 
 {% block content %}
 
-{% cache 600 all_tags_list %}
+{% cache 600 all_tags_list query %}
     <div class="post">
         {% if all_tags %}
             {% for tag in all_tags %}
@@ -22,6 +22,9 @@
         {% else %}
             {% trans 'No tags found.' %}
         {% endif %}
+        {% if query %}
+            <div><a href="{% url 'tags' %}">{% trans 'All tags' %}</a></div>
+        {% endif %}
     </div>
 {% endcache %}
 
diff --git a/boards/urls.py b/boards/urls.py
--- a/boards/urls.py
+++ b/boards/urls.py
@@ -36,7 +36,7 @@ urlpatterns = patterns('',
         name='thread_gallery'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
-    url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
+    url(r'^tags/(?P<query>\w+)?/?$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
 
diff --git a/boards/views/all_tags.py b/boards/views/all_tags.py
--- a/boards/views/all_tags.py
+++ b/boards/views/all_tags.py
@@ -4,11 +4,19 @@ from boards.views.base import BaseBoardV
 from boards.models.tag import Tag
 
 
+PARAM_TAGS = 'all_tags'
+PARAM_QUERY = 'query'
+
+
 class AllTagsView(BaseBoardView):
 
-    def get(self, request):
+    def get(self, request, query=None):
         params = dict()
 
-        params['all_tags'] = Tag.objects.get_not_empty_tags()
+        if query == 'required':
+            params[PARAM_TAGS] = Tag.objects.filter(required=True)
+        else:
+            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags()
+        params[PARAM_QUERY] = query
 
         return render(request, 'boards/tags.html', params)