From e9c650c2478ef53822215cf6b3ddd2ff2009f090 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 9 Sep 2014 20:56:01 +0800 Subject: [PATCH 001/180] Add app config to auto load xadmin on startup. --- demo_app/app/tests.py | 3 +++ demo_app/data.db | Bin 339968 -> 208896 bytes demo_app/demo/urls.py | 2 -- xadmin/__init__.py | 2 ++ xadmin/apps.py | 13 +++++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 demo_app/app/tests.py create mode 100644 xadmin/apps.py diff --git a/demo_app/app/tests.py b/demo_app/app/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/demo_app/app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/demo_app/data.db b/demo_app/data.db index 0c51655b07316cd4932da51314dd36eb3b4a3c3e..d8dbc402a35eade9e5da9fc92a3553babd41aa8f 100644 GIT binary patch literal 208896 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 literal 339968 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 XGm;1r5lI+H2uTo06OsTDvj6`-s6U}+ diff --git a/demo_app/demo/urls.py b/demo_app/demo/urls.py index 7b677eca3..2ecfd6469 100644 --- a/demo_app/demo/urls.py +++ b/demo_app/demo/urls.py @@ -2,13 +2,11 @@ # Uncomment the next two lines to enable the admin: import xadmin -xadmin.autodiscover() # from xadmin.plugins import xversion # xversion.register_models() from django.contrib import admin -admin.autodiscover() urlpatterns = patterns('', url(https://github.com/r'%5Eadmin/',%20include(admin.site.urls)), diff --git a/xadmin/__init__.py b/xadmin/__init__.py index 2eaa6c267..7aa7c8e46 100644 --- a/xadmin/__init__.py +++ b/xadmin/__init__.py @@ -65,3 +65,5 @@ def autodiscover(): # attempting to import it, otherwise we want it to bubble up. if module_has_submodule(mod, 'adminx'): raise + +default_app_config = 'xadmin.apps.XAdminConfig' \ No newline at end of file diff --git a/xadmin/apps.py b/xadmin/apps.py new file mode 100644 index 000000000..252a6cbed --- /dev/null +++ b/xadmin/apps.py @@ -0,0 +1,13 @@ +from django.apps import AppConfig +from django.core import checks +from django.utils.translation import ugettext_lazy as _ + + +class XAdminConfig(AppConfig): + """Simple AppConfig which does not do automatic discovery.""" + + name = 'xadmin' + verbose_name = _("Administration") + + def ready(self): + self.module.autodiscover() From 392922bb98b18ff72b19902b394741feba37aad7 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 9 Sep 2014 21:13:20 +0800 Subject: [PATCH 002/180] Fix HttpResponse keyword argument name. --- xadmin/views/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/views/base.py b/xadmin/views/base.py index 5966690b1..252d15b9e 100644 --- a/xadmin/views/base.py +++ b/xadmin/views/base.py @@ -182,7 +182,7 @@ def get_form_params(self, new_params=None, remove=None): def render_response(self, content, response_type='json'): if response_type == 'json': - response = HttpResponse(mimetype="application/json; charset=UTF-8") + response = HttpResponse(content_type="application/json; charset=UTF-8") response.write( json.dumps(content, cls=JSONEncoder, ensure_ascii=False)) return response From 627563c748a87f49e9ab35547721df1e29f7df22 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 9 Sep 2014 21:14:52 +0800 Subject: [PATCH 003/180] Fix related field label demo bug. --- demo_app/app/adminx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py index 30c0d1742..716188884 100644 --- a/demo_app/app/adminx.py +++ b/demo_app/app/adminx.py @@ -43,7 +43,7 @@ class MaintainInline(object): class IDCAdmin(object): - list_display = ('name', 'description', 'create_time','host__name') + list_display = ('name', 'description', 'create_time') list_display_links = ('name',) wizard_form_list = [ ('First\'s Form', ('name', 'description')), From 4df0ce6a36a21b1d6f407a2601aa6e81af0ad53b Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 9 Sep 2014 21:17:11 +0800 Subject: [PATCH 004/180] Untrack demo data.db --- demo_app/data.db | Bin 208896 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 demo_app/data.db diff --git a/demo_app/data.db b/demo_app/data.db deleted file mode 100644 index d8dbc402a35eade9e5da9fc92a3553babd41aa8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208896 zcmeI53v3)odf%rxFV3?iQQVQ1;<7msmmHB4=fS6LwYOYpq~oqQTvFsplyjLhXPUzn z=cVZ$QIvLlA$Rus#Yh#jP=`Z+yAO1oNVweo*J7N@Je`s%A+J-Vv8x_E8*s;o-FX01^XRUzX#;^H{h zD}vy1xn3o|8S-m7XQ64?~i3O+}^lcElPLqip7dt%{LXPp-8GKS4&EMIy0Fp zOlJxm!j4>A$vm|1dI z5k1@r1LJ{KSP+U~e{6i5+rO`h8)ZqX*YjebASp^iD%2W9=XFF+cXj^Nt63rL3?>;2 z3gisxhtBc%`rJei%BEiJog^)isJk0ISnc3W`DQc-vYu0Hd%!_b)2FgF_K9qoS7_2N}(awRk>D;3#xQiH3fo+{aC;s%VfBB*4pi7#w#tk z(7b|&cgWXgzK#ZoOQnP{(j#C3`u$lFePrUehWPm830%woNVaT5e%^Ela#w zQW_K3HETSwE_)`BVqb5b3Bq``g|A*yt$tUc`i4 z5lJm3zvWtq#CcOPf2_Zs`%@p(e56`*zTY^a$PL3k*As8^i+GV zuUYP>eN)M{4(5(nZnpRBd$NZOSN37IsCAu~bk6Jk zYi>4bc=vUCUX1~~o=@Y_(=m@m=%eLNmDRGXNpz~k&Z?oexn`r>e&2GoT<65)pz3wI zDbXI;0GUcA+iQ)ifd-&aqI0j#~K%7yoPgkMl+H1s@Oq0T2KI5C8!X z009sH0T2KI5CDOU$Ls1JnpeoGAf5S>g^5&NuF9$`mea}97?81iVe-PXVnjkk(`@LW+uA4u3i$Osct<4J=w;rQEo36Gzu*#8vOaeJews91Ic#Wn!?l{ww zSk=md<-nFGRYNG8>7uG*`%_dkJs-DKcfQV!NX_R<fvG ze@&^fY8Oh+Q8=w;*bg_imkUdpdT3urQnoY4-`+dUF#`KBYUY+&Dc?5^a;FKtw3T^T zxGt3mY)MdS!VPv>z@YHb1POSl{_<<&G-_d~N)FnUge&yO@$q*Z zq-WD}nd$W0)Jqffm+fZJq}a7leyftA3fI}OqVc!s{2%-OKhlN`Wgq|oAOHd&00JNY z0w4eaAOHd&@YE5&{Qs#d5*P#mAOHd&00JNY0w4eaAOHd&00JL50nGnDa->iQ0w4ea zAOHd&00JNY0w4eaAOHeS9RbY$pSmJ}K_CDEAOHd&00JNY0w4eaAOHd&@R1V;QjPfk ze;+wlCN$`S7-$R5C8!X009sH0T2KI5C8!X0D-580G-qXo0#DCMOEA=OT}AawN%Sj&Ft{K~rUdUjoyUt3*T z$PrD8+1%=w5Etw9xNt{o6t=|1NP222VMZf?Rk0!+97>{=Wr-wM6je!;E0P&C@kW;~ zHag0!vz#fn%d#rv73p?Usum>2rMo3pj=&LW!5E2|*niFKrz+olo$0(Q7AtZ!zfr4g zSH#A)ZjGwui_oPq-Rd{9_gBvn?+HYlm|tPPna(p02I-c}N0x_6_TZzVcC*%r4@ zBc)eW^XhJ0vgdFYq#;#R1sbn(Qrb|}x3Mp1%E#Xu)H3SoTvd16GWVroZJ4|Y} zBB`oeEh#!OyO*~kRJ+6n1&bEI8U$K^)=%j*`!7=qF#6%n{f60Mbu!zMt;MIOrrR3) z9kJXbtzDJws%G3^VxRZ28_he5&epyo7fX_AYwMba@4%L>g@4d?{=srt7fV{tXWf`N=l(2*XfPl zQGT{oAr@3Cvzc^T@vBm~zE!K*?oJ(q#A2}_DT<}2(;ckPRMc8Uzl#~=&{41 z-u<<4fUVwrUiAB8{r%jRdQHk(HASUB>EG^l&eZ$SK$BwZc-ItGvX`?f+1$nKH8$p< z=>BNcgIfl&523N6Rowml}8E0%<#Bq<3g)2lox6Z{O}_!{YZM zW*e)BgcbQM*Gjah*)9X^EzTDDXbq1x-G^&=dLy?tJ;RCzvtSjbl~}6%?qGFCEz=Sm ze622#DOSza`Z}nn)@Zpo@1(H+8#lkRX40m)DK%o&duf(Y^Uys^yuWZjzJ5b4|I(UZm zE`K!85~KjwMG<$1+B?EOjKnD3YUuloO9x6u6$0~do=gI^B)%dk8ABa%J zjBm=tHLbe0wz$p~;}dTk^T#fXa(n$|0>*+LS)7jIEh3ycGxmz2MGC8 z2hZpC&z;aVtMq8gn6#ylMdymF&_@ug;aQg_Y#jHBVSj9VoZG)|u78RJvSmhTNComJ zh}vwwj@Y7-9YM}u!e4u^+-YI>kV4QR9sJ~i^+bhQvuZtca;`Vuk)@sd0V2V~TM>JQ z;Mks%pUzAs3)7i`!#~m8wHEUm^nLTOE8R@2(P=ZR{`YmLt#n$OHgo0HPUq{E*- zJb5G5fyvt&25WSCVcy;c=*dwljZHXao;rjb>1a;J*exd6B^*?a_+#@E+};rDl59!p z&)OZuLKSHtM-Mc`5wpz@Exg4H+>3B8!o8>*|M>4k^oG)UFV zr`YzGzh&P>hg+>~Qi9yW3uM2-p@RqW*6&Q!9yyV?aMBlB9zF0;W-Ai%7_-%*Z|}(S z{@CCkx3_KG``N&c39@ge^bS)WIavW80pMBNcuCN5oXGU~Vpj$a&5<@V)iT4r_wUc1 z^2g@pxOYR2eAq@Zie?81|4a0j zqF;;Fqbt$j$PXglj(jz8Cz6Z280iZC*YMvDeNuE1@rjZiFU6uHbiq zUk|<=TnWwwPXzuf@LPd@68LJM5_l;P>i%!t-|YTk_h-A$`rr5ey8mbWdwz)|hz|&W z00@8p2z&wwjLv#pGu-$^u`1A$BZNi$3~S+PtrTWwN!U(zd49(08shp*;e|^VgG`2; z={`K|b!E7O8TJ`+zKd{$p3fX%BIZddr>4BFVQ!#BFl361PkLQ*+=LlA&ko@bR@f;V zQ6^?Tha;8ox-M`TDo)N!msCk;ji7n99Nm#hn^DN2@zs(uisso8Wi(|%B8T`pk{~{< z!bwwDH_3)Vx5tDrI$;Xy#@K{)OHARRb6!`98>X41X4oXD4W`({xYzY5E@flVQmDEK zwql(aGb89mv_#O&uti9WdR(QDd2^yxNbjl)IG#J#Qwtr(f&SM`6T zp6DX!xR97 zF$CHu`7c1w&HHdBlkXHQYmtPe7cF~kjP4B3%BYB;NUIu;Y3Zi@kMBbpy$4oihHbYLgOurP4nr)YsoFPQb(!Y-$F*`VBm3{(*K>w3~hnc4PP>%`T?1*&p zTEul5?Gd781l`V-2)ePh2#JUZof_OCO|7@f6po7rIReJ(EmA&m8^!yuYP`WWh8y^h?}l zRtsIfW`UjnyNG*D89fC}Mo)rWobs4BC^=1lCc?grx=AqySP!VDViC|&vOGq+Okq7a zD@;$)@)+VsRSd8yOVhOiXxi2lo&QIpRTuxe{J-IUiT_)CgJ0uk`JU(>M}If^8_}PS z{s;-g2LwO>1V8`;KmY_l00ck)1V8`;J`jOHvhFb4Gt{!yOwNF|uT1xmm4?Bd0c(+# zgqusW17vMssOPkO;gkg1mQ9b4<%Qm!UK(4E7bWWmJv}{Sfs%NT|qhK5et*H>&yD~j#=QL=K-+uKXcrUxt1zddAqAl4gW z3k%ebed#Cb0E4}Q){LKqSXXrae>D21F8*&u|CCSiLGt|n6#qT`kNAJj{{#N-@H>2- zZ$0V%1C=*~K>!3m00ck)1V8`;KmY_l00cnbVFJ>tWLY8D>p3~dS?dJaQbHi+IXPtWHC7M0dpsxmb$?^g zz<*rdQ3Vg>s{e7HciNJfxGjy7>tpwOt1w0W?FR@Qw5O7C5y)kyBZ96#T=^YHT z&;Msbii^znzsvtKvI6i8{wMgq!Dsn<{1*QvFYrOK6W~8Ze>M7z=--aM7i~oI(S>Lx zIuH$$_X2(=@>1kqMZOXFO5{xBuSd2bZ$zRISNMO0zZd#q_&37e3V%KH^Wm?A-wGE( zN_Z(e8y*aOEgTH}@6dNc|MX)leIyM6AOHd&00JNY0w4eaPm;iM9&Vg#dq-$C>f!o1 z^R=Lv;~p--IbH#p<~`g1XT9_@74vWtT>INSlP5h~hKuSOi0!kSj25Er7Pg0^nORY~ zJJ{}>V%`y5l{q&`YTmjY(|e-F!wqv0s>Jj=cf!M^xUjClHkTUL0(2d=fU#Z=H_C;n z7Mt(rQ4e>Tv%djzR`anLkzf$bmt01Uc(_5%_EyWV=Ap+R)3z5Q9P!c<;btAGNzh+ny;?L@O}Q6ha2MjRE6Pnl4Y^=RgDuYvQJlOJk^eAzPd`o z_c^B0M^zeLz09lS?TX_Jf>+n5Pj`DXPhFwzd5o2~m+I4fjD`dE&;Oq^aij+VAOHd& z00JNY0w4eaAOHd&00K{*0Dbl@p}&2(Pb64O)DXHw~8GI{1wdh_1p<&E0x#&qh;&T@Tw_KLJ~ zb!YMNa=K8y_?hNsirZ_ux%9&2rJDuu*2F@2;?4Bcwb|r_bTTzLo}42;LMnZJYV!P4 z@?461=BC*{6le>cOr4v}BVp8r2v<%!&Y00@8p2!H?xfB*=900@8p2!KE*0(k!4i3=GN0jJ=d=8$`Eh=j zALRR@zs&dYJRgYu8t;z&MfCmXFGl}3`iIfqi~ef#x1+xq{SVQ9`)pA}Za@G8KmY_l z00ck)1V8`;KmY_D3jwd2o4p%er_00ck)1V8`;KmY_l00ck) z1fD7anEyXj#Q|eL00ck)1V8`;KmY_l00ck)1VG@i5QzAqu4A5`aCLvX`_F=W@Qu)q zh5kpl8tIPwRCGA{)BLi(&-bIgW8M?q?+_t;KmY_l;0Y19m-NRzmEiXJHqRpE`5g~j=mb>a2w`j`+mTu`OEswqiA?PdzpSXHh_ra!H)ZpashQ2xMylX6VB&BCjA#cMP^eW^sjBAH z-MYjKd1rXk9~&R%KF`^!fN6*`{c|0wfhkV&NU|r$B$blXFbm9H_QL$y>e51vC|byCKyZR*g$1ZB@=vzF8JaaY3nwh|&g*z< z;kE^Tn8N*#xh0&KjjYhyYEv61CToxy6V`GI%WGL%d$X%cBtAXpi(MOkFiDM)4XDoT z^!|L@ADf@&-iZ(#Z3!FQqr?A2y)3l*sUy(ridmoP2&7rI zH*=P?z1WaH_WB&RH)9#0Rc6Z+C7+b$GIJuiyVHi=7ChW;Qk#sa!m_MQh8n1Ovb)Zy z7d6Y~53_7GGn3g!&1n5do5qocvCL5M0Lv^M4BQV7+i%JY3@c$~gJRxYodJnKJ1d>`P_(>{(wctCTik#rhoSE^o@c(FnwG3yqNIEuFZ3MS%(G842xDL7EY1T z1FUk&nOGh6IptbN?Tww)3|)SZp+-%xpg9$fJ*=UIs)sPtLd7apgpTEpJfQ(Sk^un_ z009sH0T2KI5C8!X009sH0TB3D2w?yJ$ATS+f&d7B00@8p2!H?xfB*=900@A<6D5H8 z{}aWH#6SQ9KmY_l00ck)1V8`;KmY_l;A0^`_y2RzA9ax*d_VvMKmY_l00ck)1V8`; zKmY_l;Gqa`|7h{O=KQ_MyVC__s?jJZGo`95Pu|NU3vyB@5E=B>rl{x;`bd{=s)p4|22dyDt7yGvKrlQ&nhsoeF2 zouy0jyGyH!$@P0>Id`dakN78-uCMRpE)|mN>E)@Lm+CVM<+-imjg{Js%$xUa-gs?O zyuK_i-O4Hp+jn1EORa3Kz4_+lweq&SR8}_@DwlT(7Z;R;%GRAiW~ExF%%ut!Un^d{ zxFFxSwj`vXU=75ZZ?%p&(6{3{~Z5YF7ks92!H?xfB*=900@8p2!H?xfB*=9z$cKvY4>8_ yL8~#^{Qvtd{`;T648mj(009sH0T2KI5C8!X009sH0T2KIoj|{PK5+2!|NjrK8)rEH From 9440e162546890de1058c0ab21c9cd355b5b1b51 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 9 Sep 2014 22:12:49 +0800 Subject: [PATCH 005/180] Change `module_name` to `model_name` --- requirements.txt | 2 +- xadmin/filters.py | 2 +- xadmin/locale/de_DE/LC_MESSAGES/django.mo | Bin 16281 -> 16279 bytes xadmin/locale/de_DE/LC_MESSAGES/django.po | 4 ++-- xadmin/locale/en/LC_MESSAGES/django.po | 2 +- xadmin/locale/es_MX/LC_MESSAGES/django.mo | Bin 19470 -> 19468 bytes xadmin/locale/es_MX/LC_MESSAGES/django.po | 4 ++-- xadmin/locale/eu/LC_MESSAGES/django.mo | Bin 19019 -> 19017 bytes xadmin/locale/eu/LC_MESSAGES/django.po | 4 ++-- xadmin/locale/id_ID/LC_MESSAGES/django.po | 2 +- xadmin/locale/ja/LC_MESSAGES/django.po | 2 +- xadmin/locale/lt/LC_MESSAGES/django.po | 2 +- xadmin/locale/nl_NL/LC_MESSAGES/django.po | 2 +- xadmin/locale/pl/LC_MESSAGES/django.mo | Bin 21958 -> 21956 bytes xadmin/locale/pl/LC_MESSAGES/django.po | 4 ++-- xadmin/locale/pt_BR/LC_MESSAGES/django.mo | Bin 20579 -> 20577 bytes xadmin/locale/pt_BR/LC_MESSAGES/django.po | 4 ++-- xadmin/locale/ru_RU/LC_MESSAGES/django.po | 2 +- xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 18983 -> 18981 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 4 ++-- xadmin/models.py | 2 +- xadmin/plugins/__init__.py | 2 +- xadmin/plugins/bookmark.py | 8 ++++---- xadmin/plugins/details.py | 4 ++-- xadmin/plugins/editable.py | 2 +- xadmin/plugins/inline.py | 2 +- xadmin/plugins/portal.py | 4 ++-- xadmin/plugins/relate.py | 2 +- xadmin/plugins/relfield.py | 2 +- xadmin/plugins/topnav.py | 4 ++-- xadmin/plugins/xversion.py | 6 +++--- xadmin/sites.py | 6 +++--- .../xadmin/auth/user/change_password.html | 2 +- .../model_list.results_bottom.actions.html | 2 +- .../xadmin/views/batch_change_form.html | 2 +- xadmin/templates/xadmin/views/form.html | 2 +- xadmin/templates/xadmin/views/model_form.html | 2 +- xadmin/templates/xadmin/views/quick_form.html | 2 +- xadmin/templatetags/xadmin_tags.py | 2 +- xadmin/util.py | 2 +- xadmin/views/base.py | 12 ++++++------ xadmin/views/dashboard.py | 16 ++++++++-------- xadmin/views/delete.py | 2 +- xadmin/views/edit.py | 2 +- xadmin/views/form.py | 2 +- xadmin/views/list.py | 2 +- 46 files changed, 68 insertions(+), 68 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8a51b4d65..9f2f0677d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -django>=1.5 +django>=1.7 django-crispy-forms>=1.4.0 \ No newline at end of file diff --git a/xadmin/filters.py b/xadmin/filters.py index f4eb6e9d9..178ea6581 100644 --- a/xadmin/filters.py +++ b/xadmin/filters.py @@ -333,7 +333,7 @@ def __init__(self, field, request, params, model, model_admin, field_path): self.lookup_title = other_model._meta.verbose_name self.title = self.lookup_title self.search_url = model_admin.get_admin_url('%s_%s_changelist' % ( - other_model._meta.app_label, other_model._meta.module_name)) + other_model._meta.app_label, other_model._meta.model_name)) self.label = self.label_for_value(other_model, rel_name, self.lookup_exact_val) if self.lookup_exact_val else "" self.choices = '?' if field.rel.limit_choices_to: diff --git a/xadmin/locale/de_DE/LC_MESSAGES/django.mo b/xadmin/locale/de_DE/LC_MESSAGES/django.mo index 83384667b07df1f5c90f7ce511396bb604353b46..823faffb04ab0c0a40223fc1da866ec6bb5baf21 100644 GIT binary patch delta 2705 zcmXZd4@{L+7{~E*FNj|Lc)9#lNVtkHMS&C(ia!oC5o;sK(pK0i3L6o+qKPZ7P?2nf zQ<{z#IVB1jP%_$$hK0#R=H*El554P@2`6{ub*?y`@ZLS&NRyB8Xt38C>81Dd!O6=)EP@f5Od^A~1g{32r#a2+<_ zgQx)GsEH@A1s!R|gyTL`V(qryh5yGvC*y-@zTm(I3@F1P)CxvWyZjj{p-UKrmr=X@ zlO3N%-S6Ot6e!#phng=1^DqOOaU1IXtEl^b@zIz|V;U78Bt00=g9?;_$}|&0Fbj3x z3S5S3Z~@lhE!c_$_%;^dBx+~88NtBisCg)Er4?{go9RnM`9{wpcb|sa`4Q=5c7>3T}!3kZc zl_sGJ(=Z;h?De(w`exMDSK$V%M>fR_;|iQa1&qrI?rxPN_0~P8Pxx!7??5kZ!BOne z`=7Lm&msfExDFF}`StC82v=h#YAe4$t>7{$z!b(~0F{V~n>V5t_1e{b5|zM{sKC#lYNi#nBky1=p10S(#YFnQ zqmI}`;pm7HP>C$SDB_z88q}Lvg(}8s)B{bZ%-gI-QHh*D9oa?HPK@Icyn;&5b$c+u zSkyw6q5>CN??g7++>O3W8cj4bVLxiCkE5#gBI@%2y(K$Q zftpdz@3(fK=Iut+Mj!U$G%BH^MeM&G7$^!(IE0$;JZi!TRL0j(uibCffW3Yb`Da3? z*laAp<+uY&unX7Y_s9!lGS&oZ>;crm8@x1>KqD&C7f~y3MZKp7+g* z&hL4C1MPM03deE(NA6^Y!?b@BUE6-b6WzYq^Q@!F|G8(#;ke*$iX98{Z%TUE;i&e1 Voje-qeEcbYr}vXYxh=n7_J1A!BNhMv delta 2719 zcmXZd4NR3)9LMo_x53EGlfiq!hNEA(=)i z&1<97(v6_d6z6po3l_r~S!Pa`8`;)`=+!Ofz*^?&`{SP0^>fa7p6C4k=bZoZ(CWP7 z9R4@LNixRFpJYr5)?x-eiILcZ6L1SI#%-97Bls-FWE$ha7jPoJgt52<^<2|^CN2f5-P`QsMzk@aPDy! zP2Z0ipKklJF^c{|RBlyRi1*_SxG~o_#!aK00ZrVA3e<(SV-K=!a}@)aI)xwJf$MQ8 zD!>`k#Dn+>M&z+k_$n%~owolTj>o|W#=G*I@W2rUl;J0+74)HY`2;GVQ|QI>sNMd} zj*p@4kKl+DDAwvj&6kb0VgYW#M^X0=q3-{~p%G7G3>CmLH5@P*6(}2(X%V_HfVyu6 z7U4X+9_uj+TW}73faN%h+L>H`IB*qeo?47TX9}RG^2fD^V}p8jQism`r@Lorcb;4avwHKu*K-VGNF- z61;>;;6Ky~6WRYX%t4Kp;@x8_1oxq8q|^5MZU1W|w)qKFoJoQ35d=^*w;;g&t0*cN@M0Zm!VRc| z98~7pP>JnA9aV=NKZJU&8*6X?i!q&l^n4}q=`ask8&Nf|2Q}Z}V)kE|^)R3!8$_+- zFI4d*P7fc64;$%cVJWs^JDx_pP8--~CDMrTxD}OXD{29IQ33a3A|6BCH{j5Sqj3&( z6vL>q`5krRC~8L{DQUeO@u;K8#RSYpB~W55#UlD;n1pqx=NnP;Hlr5yy1nk~prNyP z-(J{{T1l53@5L$fkE15~8FgfTqCUk5GmXhZKTgFe)XG*{9n>fM4b*p_6PMs|d{^&( zW(k$cKsQ!kIxoMz{mbwc+=JT6v#1rEM+F!`AC96DiQ(od%tgI+^{Cgl36rq{wSaEa z&h=x4-v2W+QW?02`YY(>gRKd&aWa;muGgXxcp4S>IaJNGpmyX#Ou;Yh^&c>e{$KW>n_et!=18j-ih18`Msm#X=lHB^Wz9oS+Z2 zkRnvzdDcb9W}AC){O^A=4NZ6mwbe&aRojF5#t)!sz;j#p(^`N^3YO1>}V>g>%C-_6Ta>4LLNFz(!Q2n^7x&4fUSx3`QqZ`;O3B!0&T@ zb^KoBXM(E|s$C}3n~>>peH9!`e8#&F8}}l diff --git a/xadmin/locale/de_DE/LC_MESSAGES/django.po b/xadmin/locale/de_DE/LC_MESSAGES/django.po index 07c19c358..fcf6a567c 100644 --- a/xadmin/locale/de_DE/LC_MESSAGES/django.po +++ b/xadmin/locale/de_DE/LC_MESSAGES/django.po @@ -742,8 +742,8 @@ msgstr "Klicken Sie hier, um alle Objekte über alle Seiten hinweg auszuwählen. #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" -msgstr "Alles auswählen %(total_count)s %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" +msgstr "Alles auswählen %(total_count)s %(model_name)s" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 msgid "Clear selection" diff --git a/xadmin/locale/en/LC_MESSAGES/django.po b/xadmin/locale/en/LC_MESSAGES/django.po index df836c5f6..b9e77c1c7 100644 --- a/xadmin/locale/en/LC_MESSAGES/django.po +++ b/xadmin/locale/en/LC_MESSAGES/django.po @@ -738,7 +738,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" msgstr "" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 diff --git a/xadmin/locale/es_MX/LC_MESSAGES/django.mo b/xadmin/locale/es_MX/LC_MESSAGES/django.mo index af31b601894e57954395440c8a1462dc140195c6..4aed4ac37ff89c2bfcc69f22ec74380524504db9 100644 GIT binary patch delta 2679 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 VpL8tHuW^&_>GZP+vcBwU@PBY_ID7yA delta 2689 zcmXZddra0<9LMqV<02RJ!N*6r$wQCIO-#WH7bOCXiy&ziQ6su&Y6(#)qm4;>h@6zA zrH|`kwdE|!vPnKxHmzo{CI&J82-M696gHienJb&M-k*NIjs0Hdoag+``JV4N=SSC0 z>zkcc$N3Py+Zf~W8skA9Cg5xg$3+-{ORySiF$E9eW7v;jSe9(}TZpRPjiYcm&c)Rj zgKy#(?7&DomTZC#g}Ouhnd-#I6YxdU%lmOGeu{dj+iCv+72HMCAitr4zK&7oNj2sG zdQrdkpxXOz1pb6t)G$uLUsH|Wgi=UIvnTfAt<*Cy5!d3KxC!sTKAeu}>BeN^Qpa|T zrG6Njuop*QX@)WUnJONeu?eH`1}?{lDSkV`2MH&fhB^$vbxyqzBd9lHBtC^e|ocmlP;7JS)a#Wp#&9T2ELLI;>V;PHVLOh( zcToX+gsu2FZowiB0t1;7s6bAmQhfoH>dUA=Qi)o7UWm%BrFUWW=`BWk5jV+?LZE#M7YhI`e{{N`T@>gbwfzZj32 zz=xV37sq0`V-50W8hGg1?nZ8)`3$vn1E_@zqb9tH8vh1Hfrn0lQHB1~HoX%?%0@Xox7bos4>+2sOb{)Qf9SDQ!iqd^0BEtC)m`Q0*sC z@0~}j_z%<>OPpt?ej;isreY@Zn>iG;XRA;Xx1a_Lpl(G6YQSTt08Tpfe$>i`QHL^m zzJ2}1qcU{F@i;1g?@)Vx7ISe3{rbUsn|&Bka3=M9Ovie>3j??khcF8(*f`mY+LC>! zz|Y_oyn+g#rIc?8K8w%e7pV5CGX8JiJ!Rxyd)`TdBJ060>~}otwEygQ36;8Qs0l;M zZ4*(4cLwUqS%x}OwW!QIf|{ohIoGBImHETvJk>FOf!(nLb!Zl&_VRwz7OY40Yr|07 zhU&KiQ*gKA*XW~u3D@DM3cdmOByzJ&H%`KcN_#6a<0&Y@Y*YpcoF7U9*IoBo2LjbG z1=jxH_Lz;9Wdft!4_h^XCif@Sg}}72gVw2l+mlCog=aF)2G1;OZE&}zCCX|HdcE&k Z!LH<^;h{~Bt`4@R^d|jZSU&Gc;jsPwWs1|@jDEDYp+BC+ zDcG4}JVpTw(%_9_Qk?~2P=O@iEKJ8}ti&bw0hVANrejK)F;j7cwGN}GpT>B+g4K8* z6-YUQ6u_J59%FV=sHY(a6P`Av3{z1%dLPxk7q#G|0X_x1E>W?Pz!ozI19N^fySaT z8;9zbh$P!&;CS?`q!3GCD{jIAn2SD{#^hl>DplJt43D4!X-7?b9!KE?RBErGGIa|h zu-|@vfXa;jGmas6$Hn=FQHbQjaF#Q%|1@J}Pbu?Y54D@0;UPWcjhh6D=6wbkT)mh)XLO~g*KrK{*8n7F~@gTbKgsq>qUPYz+ zE~@`usH1evbQXFNwSg(9v!8}qXC6jj8G5up6@@CSMRgoTO{j~Y)PNhYH{%>P%0eH(o*o)MM+{QAc(Ib(tTaGU4~U>YTruf(FJt zZXliLOFa{PFb6dt4|O#2F%B2o`s+A}dNpdN4LAXtP?xv|weTa<(F7Mb85oZdtZ$Mi zXoq>Y4oh)6eupbDd%iKeNV6ZgSLP?2i0&7RS%A~A1Zz8!9vRP?zmLQ~;rc z&M&+;^aRlGDg~WM6)II*Q3F3iU;GC3td867XHgT~L>=9qsQ2t$zBQ zywKLyqW(5i6_I~G3Oi`fgdd`AYXj;wx1uKQK}~cUC*dF};7GQw@$ndllTrOLa4OD5 zJ-0Vdnc0I1xDmBp%L4MRopsWniGD^ccmw0{9%^7HSGNUYF$jAx82eD;2CRdaO8q{j zVZtKkZWW{Ym7?Zbf%?a0qlZEog`=pmzJ_ZsYq8V5ANd1mI;;;+N0UPDdJ7}) zUDWS^Pf&rKLvC&TR7-@{`ij<7$$<&7 Je8I~>{{vLvSD^p^ delta 2958 zcmXZe3rv<(9LMqVau*PMK~x0v6_5c6CKhs0LNqUs3WjB+8J20G$e5SetY?AQP0M97 zFH>fhDOfYXsBA71p*cl#W5iO+TO+r^k}_Ml_5Jyr&H4GC^PK0L|M{Qu04EQ6+7Eg@ zTM^`>8)NeMFAkr>aID2Bd< zuED=hiB$5E5~#^^jM+r6n~qRS9B0e|%s}mE6RLkJYUjJr5BJ&jN2nb&qAJpa0r)kB z<8d5_9TiR6x(EB0y<9-#1m}5O5BP07?@?uWSoL3m4jY9fJ)>jYT{Om#P3k0{T@}R zA2AxQ+vj&sl?j>PIuI{=IR7Yu!93`{-<>$*0b_D$dvP9?ppIZKYKIM|owuM8X~SW7 z7WZH;>N3BY?IyAhHGV&8d<$xxZ!nql%^8B}bo^llnO*^Ur=P(nyQI!j1S9(4ar{E~HS>HTEpbD%+EmVtoVGBlKJr2Sq+itaX zqe^}QHU4+hQTpY%3ynl=APsf)*{F4<;ShWr9W78zunOx?1N%`EdbkKGT{P;96H%8l z%bJI})kU^F2g_(bihBQm?LUgz`3Y14XHXlul284I65O&Kp_7c6N;?iSa4}M4vjw$q z8)`=#w*3QY;;X1i{EAAnA5}?zZm_geClxdJX@@FR<=Gw{rP~?)=3VOMf{gU=^y;n;imWvdeaSjM_;v zs`k1ygW^uuYKmp-c*sKiQbdm(DRrKlr&0UyS7sBtHeJK&ge1j^(J zR^V;-fmtxkeerqJ5v)bsfz9Z{_fQFZjylsX(H~Ev66&<=9@LRtL|x`Ps7eGsq&Da8 zCD4n$dma2xz(Cp)FaUE=FBG7TW+slrxwgFuQ)sV6?Q{<&V23u^ zU^MHSbOPOyOMVK?gm^|E$+$(b)N27Np7Y`?5Db}GD>Ov)a4ON-nP?ycj zaubL^rZzrwLI{=-=uE0nrP_dcaR&zCLDXk;*gpRjwUbMzqq~Xvo&$>AOB#ck$A?;Y z66!NAw(TXT-woBp)IW$|BORLXE!1t@gSyQ}P!o5eCc2C%*oR6uhVAS9Q8)loQRA|3 zJQkupw;EJswxSZQN3D0Hg!*e|?R03OZq$O8(1(4f7bCg4O*jHW@jQm%Mbvx0Sa0H3 z+P5(SlV-bjs|+=6K5D*&s6T8f9fAykM$}pN;M15r$L)U~`2}g(tpA{nCS$IfU?J|J zU4dHQKg>pdE<_{dVL1Mb%kUNk;}d1>Mw}%CdT}M{b6SlWunu)M98_svNA37s)LHJe zwxG`PEUL6uQ3?KydOviYYqT{U^XVUrFX{WQAkcz8p-S6}k$4Ne==X?QvcaeXl2D0` zLw&YcsBzgi24`XtuEuoSfi>8Q{4?3*?k}k~F-tuc2~v3wIp5uB4yqzWn257bC0v2p z(Rz%=TGY>h?Wn|BPzjyb*5GaRoZhxF>M@ULZi}k(^W15k6|>mmxz^k;q$%2e&5EVX Pi_!;-x)&@jSs401AIw=o diff --git a/xadmin/locale/pl/LC_MESSAGES/django.po b/xadmin/locale/pl/LC_MESSAGES/django.po index bc62d634f..56bc418d7 100644 --- a/xadmin/locale/pl/LC_MESSAGES/django.po +++ b/xadmin/locale/pl/LC_MESSAGES/django.po @@ -792,8 +792,8 @@ msgstr "Kliknij tutaj, aby wybrać wszystkie obiekty na wszystkich stronach" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" -msgstr "Wybierz wszystkie %(total_count)s %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" +msgstr "Wybierz wszystkie %(total_count)s %(model_name)s" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 msgid "Clear selection" diff --git a/xadmin/locale/pt_BR/LC_MESSAGES/django.mo b/xadmin/locale/pt_BR/LC_MESSAGES/django.mo index 890ff8c36815981c2c5b1ad932b291d20ee713a3..d29992f30f4609d26a196f794f662257ee51de24 100644 GIT binary patch delta 2998 zcmXZdeN5F=9LMqVyMS;3k!Ll0x`2uo$p@rRtWXi~;fgqz&8KV=(2=I5Xkz;nLXBo? zdTmRV4OzzAQj?oG+iaArvc^)It!!aFG&7sc{%DkDy+8iWKfKO4_x#TJe!stSeq8Hx zu5>!@*F?F=#+ceM#-w3A4#yoBgZnTRJFphJFc$}K1C9(B6OFqu4)LM2K8$@h8ShyO@{P%)zY4eFR#X7DP#gb=FJsn3*O+)3T@#IY5|5xC2NihZ z$*6#`(1!ur&qZYtL}fY^^>#{7ftTW73}FH;x8n_{`CCx?yx`i#E2stc;G?)7Tkt&U zff~}(11m8J8*nf-p*CzqZL|j!=mAtkJ5lrAL6SB-I1>AD1iJTVG}0J8iRiHnAHz>j zrTPyQKpyqgf>ThXEJ9UgCMxsU)(Sl87_$)d3hqwvo==@>Ofmf|oQpL`;I8SQq0G8b z85~D#cp7!MKF6W>Giu%drlPOV%RB><>1X3OEW`?2h6=0;$6`0C5`Cyj|A;TKzqv-E zoq@V(-ok&N0`V1jnI<90m<-fL<){Fc;zC@F3hW3fu#>1W^%ZKJi>Ucma2WoE+(8rd z2=mzAjH96kr=TJ%!%SR)I`!)?4O>yAdlQFXKc?Vq)blzx3NQ_|VJ<4L0!-4+cDx*G z=~tnv4G+=K#0cu$o<=S78S24{r~t0p@c}HO@8^Z)<07PpW(Vr|qo{RHpek_2j(=mv zzeDYJy_ovzwBEK8?qCM}0aQjw)4hoS)H}<^Of0nh`KSslK?SlNb*lH{Cj1bOV;*0^ zdc1_)IE$06#BP>Qf0b&0f#K-PG-ecLp)#0(%BT|4vC8(>psrn`?QchACR~fE z=w;M;S5b-FLLJJ#QO`#|;Z?v*q!D5u3w4;*p)zQ;?#9*h51=Y>-x^cu%}YdGvyrG* zmW>La2(?Zz>bo(|8p2%q)kt8jX`-P>TT$=iHPnJ{p&~zs%KR8=`~+(JBUC0|qAGO` zHSbr{KeOAY635T-u3NxbhPpisn4tT=jfN)fLM_yRbFc?n@h@z|=Gl}PZy;4Pc}yz6 z2CT$4Z~^wC5($=hiA_gUW;UuKwbpu^$^K>=4IQ2jP>1ScR0dz84&4n@ruXdc(R>87 zU<&H&M$=uRcedHFg9hxy zO{n`mm3k|{5Dvn17>gTG*KIonu?wTI4>j)sD)1kWi(`JNr2aWHa^~@`6)SKB9zwla z-+b@GG8re*UxCV?9d~0V#$W+2J|7FQ1)oAcUd7G$JH}~zp?3|}q5^)-rJ)F$tuJCC z{WeU%y{HG@MrGcO%KTH*8R$oSQ10M^R~7O$&a{rfczzFJDHh>gY_j97f04IgI%>fH z>QGHX9g_K&ge%a8jTnU+Q1drqKDJ>V9!FL567IzNSdGn9#_%;ZeW?Exv5Oxh7BnR^ zv|t(P9aW+#QsqrBHTL(F;ls(Jor~eK$-5jA4y7!0)`kzIl=vJcd^Kf<^L%(^>KD%4 z@Yu8k{Jbgc+nDt%@^5%vdJg^d>D^8^oRRUYvoGA1vCY?OBKI@u<0ExrdL3s?WNh~L TF}}KIdh!mBg2;R2C;k5e)CX6= delta 3001 zcmXZeX>3$g7{>8)JKcxw3)`@@9ZQ+Al~R_1vbCj!mI4+@*u+Q~RxMa|yjmzIh%p^7 zv5f>lEcgM?K`@vgm>Pl_5JWTq!yXZd82MnTRQx~O`-R^*XU;w6ecyY|r8o9ixAs^^ zp7q!%#+aJk#-!mw?279#3U^@)wqOnJ!yIhK<=C^2F_E|fW3dUn*n)bl)&2c2cA|e2 zN8)Kr!bg2fqDiLFDa%=)NBD+kNQB*wp5j2|oo90}mHuGVBNN>58dR(=U@Qhv zIn-esZpXv83uCb)&l#`6X!{A&kSA{?2#`Dj*+5 zV3ynWqcRDgG97|?JEKs6kHrM6LNCsC$AhT(^{9PbwcW-Ws0EvF7&c=AUPL`mLz;SE zE+%3S6L2+Z!$#CbO{hS3qbm9VYTkY%X%ogCcny7MchFcuquW4Zig62$#;;JNQe725 z9%{h?R4I#4l^Ko7e7x&KJY*SDiFyT(20PEE6&N#|z7I>V1_|6YEi{zb0aON`qBcB< zI$US4Gu}YWYsXad3~@5g#AN!}_!Jgm8O}llwh#Sy09A=|s7hbO*V*6Prtu~NwS~^Y zf1(2M40SS1LXt6=sEx`{0nWt9I3E?*AyiRn25vO@iMHTUyZgl z{D_7o9!0&|lc;Se?skd zXE^oOX?@^M_zN@Wx1%yj8sSXLLcOzm%)~;sKM7T#>8L=KqfT`**5Psd1oQY3*5Vax z#c`Z;C3dfv`m0p!40OeaQG999hsvNBl~FmSW3}5~fVy@|-TqosMz5hNw+&UH7RF-8W;<0P=7-wDr>YDXLy|Qdn z07a;EMxeeM6|Pm7Lw_0)m~B?mP^68hck(uB!S_*-??q*P1T}sPHU0%Ele4HwT|mwI z4ZGt5REfP~o$Hq6T7tSgLG~;w+eo zIy-)Ra+pw+oQ68gvrv_)cYojH_M1_!`T*K`rzdErB&Sh_?*b}-d#H$`OPy2O8FT0d z(2Lcmz-OZZuSKo15(nWX?1e{B>s&$wdIxnI9+gsmmAq@26Zv4&LL;#cmZ3ISgr{&N z>b@6JZv{97qj3qw;0n}rTZjB9U_Qi1Jdc`p2^IJilLCsO}x8vb%)=3qI_##Yq3 zjjV7!ECrZPe=aJ6?f4e%#V8!eix1#XY{2;#hqrMB{(-R?pX^-2#i)SmZ5oPjqiX|p zqQ4crxD)l@9#rNBQJJ@)4%Kzk2jwBE#4(l5#$8;qFrM*z9D~EK3D>yewztaJFcY<4 zHtJ9np$^GpOvJeufy>Z?FQewaf&tu$eKCxx=vCZ+W{UGC+eYMTY|f+puZXLDl2|`8 znuZoEMZKd6R7Ivb6U+?v_j#d%$-S&op|i=GthJ%al;^Bvq5Ubv#1y)jvd%K0IjLu? zogshPB&#D-m-d5Ri}^QHo}O*}7+RLzY6U|X882C(P-DjG2+Iopmr)yUtqi}|`;-;- YXZ;-Isb9Jv{5bbu&nJzKOOMC>4=gfSXaE2J diff --git a/xadmin/locale/pt_BR/LC_MESSAGES/django.po b/xadmin/locale/pt_BR/LC_MESSAGES/django.po index e07295cdd..6fca08fae 100644 --- a/xadmin/locale/pt_BR/LC_MESSAGES/django.po +++ b/xadmin/locale/pt_BR/LC_MESSAGES/django.po @@ -743,8 +743,8 @@ msgstr "Clique aqui para selecionar os objetos através de todas as páginas" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" -msgstr "Selecionar todos %(total_count)s %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" +msgstr "Selecionar todos %(total_count)s %(model_name)s" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 msgid "Clear selection" diff --git a/xadmin/locale/ru_RU/LC_MESSAGES/django.po b/xadmin/locale/ru_RU/LC_MESSAGES/django.po index 44584cb25..dc2508b5e 100644 --- a/xadmin/locale/ru_RU/LC_MESSAGES/django.po +++ b/xadmin/locale/ru_RU/LC_MESSAGES/django.po @@ -744,7 +744,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" msgstr "" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index ea9ad22357d9d33f5a0aa7e1cc1e8c720b5951d6..3f520668ff2b80496d119b87f9c96c004c83cb31 100644 GIT binary patch delta 2998 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 M10OZsEoqMVAC!nrO#lD@ diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.po b/xadmin/locale/zh_CN/LC_MESSAGES/django.po index 404dbddb6..7b1ae13fb 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/django.po @@ -735,8 +735,8 @@ msgstr "点击此处选择所有页面中包含的对象。" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19 #, python-format -msgid "Select all %(total_count)s %(module_name)s" -msgstr "选中所有的 %(total_count)s 个 %(module_name)s" +msgid "Select all %(total_count)s %(model_name)s" +msgstr "选中所有的 %(total_count)s 个 %(model_name)s" #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20 msgid "Clear selection" diff --git a/xadmin/models.py b/xadmin/models.py index 614f40490..6f33a7606 100644 --- a/xadmin/models.py +++ b/xadmin/models.py @@ -75,7 +75,7 @@ def default(self, o): elif isinstance(o, decimal.Decimal): return str(o) elif isinstance(o, ModelBase): - return '%s.%s' % (o._meta.app_label, o._meta.module_name) + return '%s.%s' % (o._meta.app_label, o._meta.model_name) else: try: return super(JSONEncoder, self).default(o) diff --git a/xadmin/plugins/__init__.py b/xadmin/plugins/__init__.py index d6c7b2840..395a0f4c2 100644 --- a/xadmin/plugins/__init__.py +++ b/xadmin/plugins/__init__.py @@ -2,7 +2,7 @@ PLUGINS = ('actions', 'filters', 'bookmark', 'export', 'layout', 'refresh', 'sortable', 'details', 'editable', 'relate', 'chart', 'ajax', 'relfield', 'inline', 'topnav', 'portal', 'quickform', 'wizard', 'images', 'auth', 'multiselect', 'themes', 'aggregation', 'mobile', 'passwords', - 'sitemenu', 'language', 'comments','quickfilter') + 'sitemenu', 'language', 'quickfilter') def register_builtin_plugins(site): diff --git a/xadmin/plugins/bookmark.py b/xadmin/plugins/bookmark.py index 7c7dcb610..a30276b16 100644 --- a/xadmin/plugins/bookmark.py +++ b/xadmin/plugins/bookmark.py @@ -44,7 +44,7 @@ def get_context(self, context): filter(lambda i: bool(i[1] and (i[0] in (COL_LIST_VAR, ORDER_VAR, SEARCH_VAR) or i[0].startswith(FILTER_PREFIX) or i[0].startswith(RELATE_PREFIX))), self.request.GET.items()))]) - model_info = (self.opts.app_label, self.opts.module_name) + model_info = (self.opts.app_label, self.opts.model_name) has_selected = False menu_title = _(u"Bookmark") list_base_url = reverse('xadmin:%s_%s_changelist' % @@ -75,7 +75,7 @@ def check_item(i): has_selected = True content_type = ContentType.objects.get_for_model(self.model) - bk_model_info = (Bookmark._meta.app_label, Bookmark._meta.module_name) + bk_model_info = (Bookmark._meta.app_label, Bookmark._meta.model_name) bookmarks_queryset = Bookmark.objects.filter( content_type=content_type, url_name='xadmin:%s_%s_changelist' % model_info @@ -125,9 +125,9 @@ def block_nav_menu(self, context, nodes): class BookmarkView(ModelAdminView): @csrf_protect_m - @transaction.commit_on_success + @transaction.atomic def post(self, request): - model_info = (self.opts.app_label, self.opts.module_name) + model_info = (self.opts.app_label, self.opts.model_name) url_name = 'xadmin:%s_%s_changelist' % model_info bookmark = Bookmark( content_type=ContentType.objects.get_for_model(self.model), diff --git a/xadmin/plugins/details.py b/xadmin/plugins/details.py index 2c37fe118..0b5ed919e 100644 --- a/xadmin/plugins/details.py +++ b/xadmin/plugins/details.py @@ -39,12 +39,12 @@ def result_item(self, item, obj, field_name, row): try: item_res_uri = reverse( '%s:%s_%s_detail' % (self.admin_site.app_name, - opts.app_label, opts.module_name), + opts.app_label, opts.model_name), args=(getattr(rel_obj, opts.pk.attname),)) if item_res_uri: if has_change_perm: edit_url = reverse( - '%s:%s_%s_change' % (self.admin_site.app_name, opts.app_label, opts.module_name), + '%s:%s_%s_change' % (self.admin_site.app_name, opts.app_label, opts.model_name), args=(getattr(rel_obj, opts.pk.attname),)) else: edit_url = '' diff --git a/xadmin/plugins/editable.py b/xadmin/plugins/editable.py index 6a20cc79c..b2ddd7c92 100644 --- a/xadmin/plugins/editable.py +++ b/xadmin/plugins/editable.py @@ -129,7 +129,7 @@ def get(self, request, object_id): @filter_hook @csrf_protect_m - @transaction.commit_on_success + @transaction.atomic def post(self, request, object_id): model_fields = [f.name for f in self.opts.fields] fields = [f for f in request.POST.keys() if f in model_fields] diff --git a/xadmin/plugins/inline.py b/xadmin/plugins/inline.py index 56a0a5c18..23dfae2a2 100644 --- a/xadmin/plugins/inline.py +++ b/xadmin/plugins/inline.py @@ -441,7 +441,7 @@ def _get_detail_formset_instance(self, inline): replace_field_to_value(formset.helper.layout, inline) model = inline.model opts = model._meta - fake_admin_class = type(str('%s%sFakeAdmin' % (opts.app_label, opts.module_name)), (object, ), {'model': model}) + fake_admin_class = type(str('%s%sFakeAdmin' % (opts.app_label, opts.model_name)), (object, ), {'model': model}) for form in formset.forms: instance = form.instance if instance.pk: diff --git a/xadmin/plugins/portal.py b/xadmin/plugins/portal.py index de433a5cd..40199a249 100644 --- a/xadmin/plugins/portal.py +++ b/xadmin/plugins/portal.py @@ -23,7 +23,7 @@ def get_layout_objects(layout, clz, objects): class ModelFormPlugin(BasePortalPlugin): def _portal_key(self): - return '%s_%s_editform_portal' % (self.opts.app_label, self.opts.module_name) + return '%s_%s_editform_portal' % (self.opts.app_label, self.opts.model_name) def get_form_helper(self, helper): cs = [] @@ -64,7 +64,7 @@ def block_form_top(self, context, node): class ModelDetailPlugin(ModelFormPlugin): def _portal_key(self): - return '%s_%s_detail_portal' % (self.opts.app_label, self.opts.module_name) + return '%s_%s_detail_portal' % (self.opts.app_label, self.opts.model_name) def block_after_fieldsets(self, context, node): # put portal key and submit url to page diff --git a/xadmin/plugins/relate.py b/xadmin/plugins/relate.py index 37b8aee97..c3ac56ff5 100644 --- a/xadmin/plugins/relate.py +++ b/xadmin/plugins/relate.py @@ -43,7 +43,7 @@ def related_link(self, instance): links = [] for r, view_perm, add_perm in self.get_related_list(): label = r.opts.app_label - model_name = r.opts.module_name + model_name = r.opts.model_name f = r.field rel_name = f.rel.get_related_field().name diff --git a/xadmin/plugins/relfield.py b/xadmin/plugins/relfield.py index 14248b44d..9a5f5e4fb 100644 --- a/xadmin/plugins/relfield.py +++ b/xadmin/plugins/relfield.py @@ -25,7 +25,7 @@ def render(self, name, value, attrs=None): else: attrs['class'] = attrs['class'] + ' select-search' attrs['data-search-url'] = self.admin_view.get_admin_url( - '%s_%s_changelist' % (to_opts.app_label, to_opts.module_name)) + '%s_%s_changelist' % (to_opts.app_label, to_opts.model_name)) attrs['data-placeholder'] = _('Search %s') % to_opts.verbose_name attrs['data-choices'] = '?' if self.rel.limit_choices_to: diff --git a/xadmin/plugins/topnav.py b/xadmin/plugins/topnav.py index d7a81ddad..daa58bd9b 100644 --- a/xadmin/plugins/topnav.py +++ b/xadmin/plugins/topnav.py @@ -31,7 +31,7 @@ def block_top_navbar(self, context, nodes): app_label = model._meta.app_label if self.has_model_perm(model, "view"): - info = (app_label, model._meta.module_name) + info = (app_label, model._meta.model_name) if getattr(self.admin_site._registry[model], 'search_fields', None): try: search_models.append({ @@ -57,7 +57,7 @@ def block_top_navmenu(self, context, nodes): app_label = model._meta.app_label if self.has_model_perm(model, "add"): - info = (app_label, model._meta.module_name) + info = (app_label, model._meta.model_name) try: add_models.append({ 'title': _('Add %s') % capfirst(model._meta.verbose_name), diff --git a/xadmin/plugins/xversion.py b/xadmin/plugins/xversion.py index d4ff5f727..680561cce 100644 --- a/xadmin/plugins/xversion.py +++ b/xadmin/plugins/xversion.py @@ -221,7 +221,7 @@ def get_context(self): context.update({ "opts": opts, "app_label": opts.app_label, - "module_name": capfirst(opts.verbose_name), + "model_name": capfirst(opts.verbose_name), "title": _("Recover deleted %(name)s") % {"name": force_unicode(opts.verbose_name_plural)}, "deleted": deleted, "changelist_url": self.model_admin_url("https://github.com/changelist"), @@ -262,7 +262,7 @@ def get_context(self): context.update({ 'title': _('Change history: %s') % force_unicode(self.obj), 'action_list': action_list, - 'module_name': capfirst(force_unicode(opts.verbose_name_plural)), + 'model_name': capfirst(force_unicode(opts.verbose_name_plural)), 'object': self.obj, 'app_label': opts.app_label, "changelist_url": self.model_admin_url("https://github.com/changelist"), @@ -580,7 +580,7 @@ def total_form_count_hack(count): if self.request.method == 'GET' and formset.helper and formset.helper.layout: helper = formset.helper helper.filter(basestring).wrap(InlineDiffField) - fake_admin_class = type(str('%s%sFakeAdmin' % (self.opts.app_label, self.opts.module_name)), (object, ), {'model': self.model}) + fake_admin_class = type(str('%s%sFakeAdmin' % (self.opts.app_label, self.opts.model_name)), (object, ), {'model': self.model}) for form in formset.forms: instance = form.instance if instance.pk: diff --git a/xadmin/sites.py b/xadmin/sites.py index 5ad923afd..222dbaf6f 100644 --- a/xadmin/sites.py +++ b/xadmin/sites.py @@ -107,7 +107,7 @@ def register(self, model_or_iterable, admin_class=object, **options): # which causes issues later on. options['__module__'] = __name__ - admin_class = type(str("%s%sAdmin" % (model._meta.app_label, model._meta.module_name)), (admin_class,), options or {}) + admin_class = type(str("%s%sAdmin" % (model._meta.app_label, model._meta.model_name)), (admin_class,), options or {}) admin_class.model = model admin_class.order = self.model_admins_order self.model_admins_order += 1 @@ -309,12 +309,12 @@ def wrapper(*args, **kwargs): view_urls = [url( path, wrap( self.create_model_admin_view(clz, model, admin_class)), - name=name % (model._meta.app_label, model._meta.module_name)) + name=name % (model._meta.app_label, model._meta.model_name)) for path, clz, name in self._registry_modelviews] urlpatterns += patterns('', url( r'^%s/%s/' % ( - model._meta.app_label, model._meta.module_name), + model._meta.app_label, model._meta.model_name), include(patterns('', *view_urls))) ) diff --git a/xadmin/templates/xadmin/auth/user/change_password.html b/xadmin/templates/xadmin/auth/user/change_password.html index a7e5f3308..6a93649b0 100644 --- a/xadmin/templates/xadmin/auth/user/change_password.html +++ b/xadmin/templates/xadmin/auth/user/change_password.html @@ -25,7 +25,7 @@ {% endblock %} {% block content %} -
{% csrf_token %}{% block form_top %}{% endblock %} +{% csrf_token %}{% block form_top %}{% endblock %} {% if errors %}
{% blocktrans count counter=errors|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} diff --git a/xadmin/templates/xadmin/blocks/model_list.results_bottom.actions.html b/xadmin/templates/xadmin/blocks/model_list.results_bottom.actions.html index 37c568af0..8705a0431 100644 --- a/xadmin/templates/xadmin/blocks/model_list.results_bottom.actions.html +++ b/xadmin/templates/xadmin/blocks/model_list.results_bottom.actions.html @@ -16,7 +16,7 @@
{% if actions_selection_counter %} {% if cl.result_count != cl.result_list|length %} - + {% endif %} diff --git a/xadmin/templates/xadmin/views/batch_change_form.html b/xadmin/templates/xadmin/views/batch_change_form.html index 6c65408fd..11ce46d6c 100644 --- a/xadmin/templates/xadmin/views/batch_change_form.html +++ b/xadmin/templates/xadmin/views/batch_change_form.html @@ -17,7 +17,7 @@ {% endblock %} {% block content %} -{% csrf_token %} +{% csrf_token %} {% if errors %}
diff --git a/xadmin/templates/xadmin/views/form.html b/xadmin/templates/xadmin/views/form.html index b2691ba80..6f84b11b9 100644 --- a/xadmin/templates/xadmin/views/form.html +++ b/xadmin/templates/xadmin/views/form.html @@ -8,7 +8,7 @@ {{ title }}{% endblock %} {% block content %} -{% csrf_token %} +{% csrf_token %} {% block form_top %}{% endblock %} {% view_block 'form_top' %} diff --git a/xadmin/templates/xadmin/views/model_form.html b/xadmin/templates/xadmin/views/model_form.html index bc5ca8082..c09901f3d 100644 --- a/xadmin/templates/xadmin/views/model_form.html +++ b/xadmin/templates/xadmin/views/model_form.html @@ -10,7 +10,7 @@ {{ title }}{% endblock %} {% block content %} -{% csrf_token %} +{% csrf_token %} {% block form_top %}{% endblock %} {% view_block 'form_top' %} diff --git a/xadmin/templates/xadmin/views/quick_form.html b/xadmin/templates/xadmin/views/quick_form.html index 293e3ff59..5de7a89e4 100644 --- a/xadmin/templates/xadmin/views/quick_form.html +++ b/xadmin/templates/xadmin/views/quick_form.html @@ -1,7 +1,7 @@ {% load i18n %} {% load xadmin_tags %} {% load crispy_forms_tags %} -{% csrf_token %} +{% csrf_token %} {% crispy form %} {{ media.css }} diff --git a/xadmin/templatetags/xadmin_tags.py b/xadmin/templatetags/xadmin_tags.py index a99ae7fb0..4ccc885f5 100644 --- a/xadmin/templatetags/xadmin_tags.py +++ b/xadmin/templatetags/xadmin_tags.py @@ -27,7 +27,7 @@ def view_block(context, block_name, *args, **kwargs): @register.filter def admin_urlname(value, arg): - return 'xadmin:%s_%s_%s' % (value.app_label, value.module_name, arg) + return 'xadmin:%s_%s_%s' % (value.app_label, value.model_name, arg) static = register.simple_tag(static) diff --git a/xadmin/util.py b/xadmin/util.py index 04731dbdc..879ccd194 100644 --- a/xadmin/util.py +++ b/xadmin/util.py @@ -427,7 +427,7 @@ def help_text_for_field(name, model): def admin_urlname(value, arg): - return 'xadmin:%s_%s_%s' % (value.app_label, value.module_name, arg) + return 'xadmin:%s_%s_%s' % (value.app_label, value.model_name, arg) def boolean_icon(field_val): diff --git a/xadmin/views/base.py b/xadmin/views/base.py index 252d15b9e..ad46ad2b0 100644 --- a/xadmin/views/base.py +++ b/xadmin/views/base.py @@ -133,11 +133,11 @@ def get_admin_url(https://github.com/self,%20name,%20*args,%20**kwargs): def get_model_url(https://github.com/self,%20model,%20name,%20*args,%20**kwargs): return reverse( '%s:%s_%s_%s' % (self.admin_site.app_name, model._meta.app_label, - model._meta.module_name, name), + model._meta.model_name, name), args=args, kwargs=kwargs, current_app=self.admin_site.name) def get_model_perm(self, model, name): - return '%s.%s_%s' % (model._meta.app_label, name, model._meta.module_name) + return '%s.%s_%s' % (model._meta.app_label, name, model._meta.model_name) def has_model_perm(self, model, name, user=None): user = user or self.user @@ -473,8 +473,8 @@ class ModelAdminView(CommAdminView): def __init__(self, request, *args, **kwargs): self.opts = self.model._meta self.app_label = self.model._meta.app_label - self.module_name = self.model._meta.module_name - self.model_info = (self.app_label, self.module_name) + self.model_name = self.model._meta.model_name + self.model_info = (self.app_label, self.model_name) super(ModelAdminView, self).__init__(request, *args, **kwargs) @@ -483,7 +483,7 @@ def get_context(self): new_context = { "opts": self.opts, "app_label": self.app_label, - "module_name": self.module_name, + "model_name": self.model_name, "verbose_name": force_unicode(self.opts.verbose_name), 'model_icon': self.get_model_icon(self.model), } @@ -526,7 +526,7 @@ def get_object_url(https://github.com/self,%20obj): def model_admin_url(https://github.com/self,%20name,%20*args,%20**kwargs): return reverse( "%s:%s_%s_%s" % (self.admin_site.app_name, self.opts.app_label, - self.module_name, name), args=args, kwargs=kwargs) + self.model_name, name), args=args, kwargs=kwargs) def get_model_perms(self): """ diff --git a/xadmin/views/dashboard.py b/xadmin/views/dashboard.py index 4b711cd91..1762626e5 100644 --- a/xadmin/views/dashboard.py +++ b/xadmin/views/dashboard.py @@ -265,7 +265,7 @@ def __init__(self, field): def __iter__(self): from xadmin import site as g_admin_site for m, ma in g_admin_site._registry.items(): - yield ('%s.%s' % (m._meta.app_label, m._meta.module_name), + yield ('%s.%s' % (m._meta.app_label, m._meta.model_name), m._meta.verbose_name) @@ -296,7 +296,7 @@ def to_python(self, value): def prepare_value(self, value): if isinstance(value, ModelBase): - value = '%s.%s' % (value._meta.app_label, value._meta.module_name) + value = '%s.%s' % (value._meta.app_label, value._meta.model_name) return value def valid_value(self, value): @@ -310,7 +310,7 @@ def valid_value(self, value): class ModelBaseWidget(BaseWidget): app_label = None - module_name = None + model_name = None model_perm = 'change' model = ModelChoiceField(label=_(u'Target Model'), widget=exwidgets.AdminSelectWidget) @@ -321,7 +321,7 @@ def __init__(self, dashboard, data): def setup(self): self.model = self.cleaned_data['model'] self.app_label = self.model._meta.app_label - self.module_name = self.model._meta.module_name + self.model_name = self.model._meta.model_name super(ModelBaseWidget, self).setup() @@ -334,7 +334,7 @@ def filte_choices_model(self, model, modeladmin): def model_admin_url(https://github.com/self,%20name,%20*args,%20**kwargs): return reverse( "%s:%s_%s_%s" % (self.admin_site.app_name, self.app_label, - self.module_name, name), args=args, kwargs=kwargs) + self.model_name, name), args=args, kwargs=kwargs) class PartialBaseWidget(BaseWidget): @@ -383,10 +383,10 @@ def context(self, context): btn = {} if 'model' in b: model = self.get_model(b['model']) - if not self.user.has_perm("%s.view_%s" % (model._meta.app_label, model._meta.module_name)): + if not self.user.has_perm("%s.view_%s" % (model._meta.app_label, model._meta.model_name)): continue btn['url'] = reverse("%s:%s_%s_%s" % (self.admin_site.app_name, model._meta.app_label, - model._meta.module_name, b.get('view', 'changelist'))) + model._meta.model_name, b.get('view', 'changelist'))) btn['title'] = model._meta.verbose_name btn['icon'] = self.dashboard.get_model_icon(model) else: @@ -575,7 +575,7 @@ def get_context(self): 'portal_key': self.get_portal_key(), 'columns': [('col-sm-%d' % int(12 / len(self.widgets)), ws) for ws in self.widgets], 'has_add_widget_permission': self.has_model_perm(UserWidget, 'add') and self.widget_customiz, - 'add_widget_url': self.get_admin_url('https://github.com/%s_%s_add'%20%%20(UserWidget._meta.app_label,%20UserWidget._meta.module_name)) + + 'add_widget_url': self.get_admin_url('https://github.com/%s_%s_add'%20%%20(UserWidget._meta.app_label,%20UserWidget._meta.model_name)) + "?user=%s&page_id=%s&_redirect=%s" % (self.user.id, self.get_page_id(), urlquote(self.request.get_full_path())) } context = super(Dashboard, self).get_context() diff --git a/xadmin/views/delete.py b/xadmin/views/delete.py index 78140cf79..9c15aefb7 100644 --- a/xadmin/views/delete.py +++ b/xadmin/views/delete.py @@ -41,7 +41,7 @@ def get(self, request, object_id): self.get_template_list("views/model_delete_confirm.html"), context, current_app=self.admin_site.name) @csrf_protect_m - @transaction.commit_on_success + @transaction.atomic @filter_hook def post(self, request, object_id): if self.perms_needed: diff --git a/xadmin/views/edit.py b/xadmin/views/edit.py index 81c0baa01..a0a23c318 100644 --- a/xadmin/views/edit.py +++ b/xadmin/views/edit.py @@ -250,7 +250,7 @@ def get(self, request, *args, **kwargs): return self.get_response() @csrf_protect_m - @transaction.commit_on_success + @transaction.atomic @filter_hook def post(self, request, *args, **kwargs): self.instance_forms() diff --git a/xadmin/views/form.py b/xadmin/views/form.py index 544c52a25..1be1a90ec 100644 --- a/xadmin/views/form.py +++ b/xadmin/views/form.py @@ -100,7 +100,7 @@ def get(self, request, *args, **kwargs): return self.get_response() @csrf_protect_m - @transaction.commit_on_success + @transaction.atomic @filter_hook def post(self, request, *args, **kwargs): self.instance_forms() diff --git a/xadmin/views/list.py b/xadmin/views/list.py index 457cd237f..7cd62b03e 100644 --- a/xadmin/views/list.py +++ b/xadmin/views/list.py @@ -375,7 +375,7 @@ def get_context(self): for f in (self.opts.fields + self.get_model_method_fields()) if f.name not in self.list_exclude] new_context = { - 'module_name': force_unicode(self.opts.verbose_name_plural), + 'model_name': force_unicode(self.opts.verbose_name_plural), 'title': self.title, 'cl': self, 'model_fields': model_fields, From 91e290719dd3f65c6ca1a19c05bfee8230bfd173 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 10 Sep 2014 16:40:50 +0800 Subject: [PATCH 006/180] change django-reversion project changlog page url. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f863e6695..ae8d226ca 100644 --- a/README.rst +++ b/README.rst @@ -81,7 +81,7 @@ Install Requires .. _django: http://djangoproject.com .. _django-crispy-forms: http://django-crispy-forms.rtfd.org .. _django-reversion: https://github.com/etianen/django-reversion -.. _changelog: https://github.com/etianen/django-reversion/blob/master/CHANGELOG.markdown +.. _changelog: https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst .. _xlwt: http://www.python-excel.org/ .. _xlsxwriter: https://github.com/jmcnamara/XlsxWriter From 2fe0b1057493360df59c2c3672137a247b82cd81 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 10 Sep 2014 17:21:35 +0800 Subject: [PATCH 007/180] silence the system check warning. --- demo_app/demo/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py index 67907560a..5f2e2348f 100644 --- a/demo_app/demo/settings.py +++ b/demo_app/demo/settings.py @@ -146,6 +146,8 @@ DATETIME_FORMAT = 'Y-m-d H:i' TIME_FORMAT = 'H:i' +TEST_RUNNER = 'django.test.runner.DiscoverRunner' + # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to # the site admins on every HTTP 500 error when DEBUG=False. From c2aa33908919a9b7063a9991f3de72253a9694d2 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 11 Sep 2014 16:15:15 +0800 Subject: [PATCH 008/180] Xadmin demo will force show reversion feature. --- demo_app/demo/settings.py | 2 +- demo_app/demo/urls.py | 4 ++-- requirements.txt | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py index 5f2e2348f..678c1c369 100644 --- a/demo_app/demo/settings.py +++ b/demo_app/demo/settings.py @@ -137,7 +137,7 @@ 'xadmin', 'crispy_forms', - #'reversion', + 'reversion', 'app', ) diff --git a/demo_app/demo/urls.py b/demo_app/demo/urls.py index 2ecfd6469..7c425d02c 100644 --- a/demo_app/demo/urls.py +++ b/demo_app/demo/urls.py @@ -3,8 +3,8 @@ # Uncomment the next two lines to enable the admin: import xadmin -# from xadmin.plugins import xversion -# xversion.register_models() +from xadmin.plugins import xversion +xversion.register_models() from django.contrib import admin diff --git a/requirements.txt b/requirements.txt index 9f2f0677d..6e311f1b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ django>=1.7 -django-crispy-forms>=1.4.0 \ No newline at end of file +django-crispy-forms>=1.4.0 +django-reversion>=1.8.3 \ No newline at end of file From 6bb4833b5f8aca3f39a28ceaebe99a99b826bd37 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 11 Sep 2014 16:15:45 +0800 Subject: [PATCH 009/180] Provisional Django 1.7 support --- xadmin/plugins/inline.py | 24 ++++++++++++++++-------- xadmin/plugins/quickform.py | 4 +++- xadmin/templates/xadmin/base_site.html | 3 ++- xadmin/views/base.py | 19 +++++++++++++------ xadmin/views/edit.py | 16 +++++++++++++--- xadmin/widgets.py | 4 ++-- 6 files changed, 49 insertions(+), 21 deletions(-) diff --git a/xadmin/plugins/inline.py b/xadmin/plugins/inline.py index 23dfae2a2..ca8b61daf 100644 --- a/xadmin/plugins/inline.py +++ b/xadmin/plugins/inline.py @@ -2,10 +2,11 @@ import inspect from django import forms from django.forms.formsets import all_valid, DELETION_FIELD_NAME -from django.forms.models import inlineformset_factory, BaseInlineFormSet +from django.forms.models import inlineformset_factory, BaseInlineFormSet, modelform_defines_fields from django.contrib.contenttypes.generic import BaseGenericInlineFormSet, generic_inlineformset_factory from django.template import loader from django.template.loader import render_to_string +from django.contrib.auth import get_permission_codename from xadmin.layout import FormHelper, Layout, flatatt, Container, Column, Field, Fieldset from xadmin.sites import site from xadmin.views import BaseAdminPlugin, ModelFormAdminView, DetailAdminView, filter_hook @@ -157,6 +158,7 @@ def get_formset(self, **kwargs): "form": self.form, "formset": self.formset, "fk_name": self.fk_name, + 'fields': forms.ALL_FIELDS, "exclude": exclude, "formfield_callback": self.formfield_for_dbfield, "extra": self.extra, @@ -164,6 +166,7 @@ def get_formset(self, **kwargs): "can_delete": can_delete, } defaults.update(kwargs) + return inlineformset_factory(self.parent_model, self.model, **defaults) @filter_hook @@ -250,8 +253,9 @@ def queryset(self): def has_add_permission(self): if self.opts.auto_created: return self.has_change_permission() - return self.user.has_perm( - self.opts.app_label + '.' + self.opts.get_add_permission()) + + codename = get_permission_codename('add', self.opts) + return self.user.has_perm("%s.%s" % (self.opts.app_label, codename)) def has_change_permission(self): opts = self.opts @@ -260,14 +264,16 @@ def has_change_permission(self): if field.rel and field.rel.to != self.parent_model: opts = field.rel.to._meta break - return self.user.has_perm( - opts.app_label + '.' + opts.get_change_permission()) + + codename = get_permission_codename('change', opts) + return self.user.has_perm("%s.%s" % (opts.app_label, codename)) def has_delete_permission(self): if self.opts.auto_created: return self.has_change_permission() - return self.user.has_perm( - self.opts.app_label + '.' + self.opts.get_delete_permission()) + + codename = get_permission_codename('delete', self.opts) + return self.user.has_perm("%s.%s" % (self.opts.app_label, codename)) class GenericInlineModelAdmin(InlineModelAdmin): @@ -298,9 +304,11 @@ def get_formset(self, **kwargs): "can_delete": can_delete, "can_order": False, "max_num": self.max_num, - "exclude": exclude + "exclude": exclude, + 'fields': forms.ALL_FIELDS } defaults.update(kwargs) + return generic_inlineformset_factory(self.model, **defaults) diff --git a/xadmin/plugins/quickform.py b/xadmin/plugins/quickform.py index 823965add..e06f9a822 100644 --- a/xadmin/plugins/quickform.py +++ b/xadmin/plugins/quickform.py @@ -45,7 +45,6 @@ class RelatedFieldWidgetWrapper(forms.Widget): admin interface. """ def __init__(self, widget, rel, add_url, rel_add_url): - self.is_hidden = widget.is_hidden self.needs_multipart_form = widget.needs_multipart_form self.attrs = widget.attrs self.choices = widget.choices @@ -56,6 +55,9 @@ def __init__(self, widget, rel, add_url, rel_add_url): self.add_url = add_url self.rel_add_url = rel_add_url + if hasattr(self, 'input_type'): + self.input_type = widget.input_type + def __deepcopy__(self, memo): obj = copy.copy(self) obj.widget = copy.deepcopy(self.widget, memo) diff --git a/xadmin/templates/xadmin/base_site.html b/xadmin/templates/xadmin/base_site.html index 14fbc399a..6b4be49ab 100644 --- a/xadmin/templates/xadmin/base_site.html +++ b/xadmin/templates/xadmin/base_site.html @@ -1,6 +1,7 @@ {% extends 'xadmin/base.html' %} {% load i18n xadmin_tags %} {% load url from future %} +{% load firstof from future %} {% block title %}{{ title }} | {{ site_title }}{% endblock %} @@ -16,7 +17,7 @@ {% if user.is_active and user.is_staff %}
  • - {% trans 'Welcome,' %} {% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %} + {% trans 'Welcome,' %} {% firstof user.first_name user.username %} diff --git a/xadmin/views/base.py b/xadmin/views/base.py index ad46ad2b0..a80fe4b9d 100644 --- a/xadmin/views/base.py +++ b/xadmin/views/base.py @@ -10,6 +10,7 @@ from django.utils.encoding import force_unicode from django.conf import settings from django.contrib import messages +from django.contrib.auth import get_permission_codename from django.core.exceptions import ValidationError from django.core.serializers.json import DjangoJSONEncoder from django.core.urlresolvers import reverse @@ -561,17 +562,23 @@ def queryset(self): Returns a QuerySet of all model instances that can be edited by the admin site. This is used by changelist_view. """ - return self.model._default_manager.get_query_set() + return self.model._default_manager.get_queryset() def has_view_permission(self, obj=None): - return ('view' not in self.remove_permissions) and (self.user.has_perm('%s.view_%s' % self.model_info) or \ - self.user.has_perm('%s.change_%s' % self.model_info)) + view_codename = get_permission_codename('view', self.opts) + change_codename = get_permission_codename('change', self.opts) + + return ('view' not in self.remove_permissions) and (self.user.has_perm('%s.%s' % (self.app_label, view_codename)) or \ + self.user.has_perm('%s.%s' % (self.app_label, change_codename))) def has_add_permission(self): - return ('add' not in self.remove_permissions) and self.user.has_perm('%s.add_%s' % self.model_info) + codename = get_permission_codename('add', self.opts) + return ('add' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename)) def has_change_permission(self, obj=None): - return ('change' not in self.remove_permissions) and self.user.has_perm('%s.change_%s' % self.model_info) + codename = get_permission_codename('change', self.opts) + return ('change' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename)) def has_delete_permission(self, obj=None): - return ('delete' not in self.remove_permissions) and self.user.has_perm('%s.delete_%s' % self.model_info) + codename = get_permission_codename('delete', self.opts) + return ('delete' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename)) diff --git a/xadmin/views/edit.py b/xadmin/views/edit.py index a0a23c318..cded7a723 100644 --- a/xadmin/views/edit.py +++ b/xadmin/views/edit.py @@ -2,9 +2,9 @@ from django import forms from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import PermissionDenied +from django.core.exceptions import PermissionDenied, FieldError from django.db import models, transaction -from django.forms.models import modelform_factory +from django.forms.models import modelform_factory, modelform_defines_fields from django.http import Http404, HttpResponseRedirect from django.template.response import TemplateResponse from django.utils.encoding import force_unicode @@ -93,7 +93,7 @@ def formfield_for_dbfield(self, db_field, **kwargs): def get_field_style(self, db_field, style, **kwargs): if style in ('radio', 'radio-inline') and (db_field.choices or isinstance(db_field, models.ForeignKey)): attrs = {'widget': widgets.AdminRadioSelect( - attrs={'inline': style == 'radio-inline'})} + attrs={'inline': 'inline' if style == 'radio-inline' else ''})} if db_field.choices: attrs['choices'] = db_field.get_choices( include_blank=db_field.blank, @@ -173,8 +173,18 @@ def get_model_form(self, **kwargs): "formfield_callback": self.formfield_for_dbfield, } defaults.update(kwargs) + + if defaults['fields'] is None and not modelform_defines_fields(defaults['form']): + defaults['fields'] = forms.ALL_FIELDS + return modelform_factory(self.model, **defaults) + try: + return modelform_factory(self.model, **defaults) + except FieldError as e: + raise FieldError('%s. Check fields/fieldsets/exclude attributes of class %s.' + % (e, self.__class__.__name__)) + @filter_hook def get_form_layout(self): layout = copy.deepcopy(self.form_layout) diff --git a/xadmin/widgets.py b/xadmin/widgets.py index 9880f69f7..c860c7c25 100644 --- a/xadmin/widgets.py +++ b/xadmin/widgets.py @@ -3,7 +3,7 @@ """ from itertools import chain from django import forms -from django.forms.widgets import RadioFieldRenderer, RadioInput +from django.forms.widgets import RadioFieldRenderer, RadioChoiceInput from django.utils.encoding import force_unicode from django.utils.safestring import mark_safe from django.utils.html import conditional_escape @@ -70,7 +70,7 @@ def format_output(self, rendered_widgets): (rendered_widgets[0], rendered_widgets[1])) -class AdminRadioInput(RadioInput): +class AdminRadioInput(RadioChoiceInput): def render(self, name=None, value=None, attrs=None, choices=()): name = name or self.name From a1d751bf701c1385f5438dd448ce6b09b2ee5f48 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 11 Sep 2014 16:50:20 +0800 Subject: [PATCH 010/180] Update TestSuit --- tests/runtests.py | 7 ++++++- tests/settings.py | 2 +- tests/urls.py | 2 +- tests/xtests/__init__.py | 0 tests/xtests/site/tests.py | 2 +- tests/xtests/view_base/tests.py | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 tests/xtests/__init__.py diff --git a/tests/runtests.py b/tests/runtests.py index a9426937f..0f7884b47 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -4,6 +4,9 @@ import sys import tempfile +import django + + TEST_ROOT = os.path.realpath(os.path.dirname(__file__)) RUNTESTS_DIR = os.path.join(TEST_ROOT, 'xtests') @@ -72,6 +75,8 @@ def setup(verbosity, test_labels): # Load all the ALWAYS_INSTALLED_APPS. # (This import statement is intentionally delayed until after we # access settings because of the USE_I18N dependency.) + + django.setup() from django.db.models.loading import get_apps, load_app get_apps() @@ -80,7 +85,7 @@ def setup(verbosity, test_labels): test_modules = get_test_modules() for module_name in test_modules: - module_label = '.'.join(['xtests', module_name]) + module_label = module_name # if the module was named on the command line, or # no modules were named (i.e., run all), import # this module and add it to the list to test. diff --git a/tests/settings.py b/tests/settings.py index f1bfda658..c07079818 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -4,7 +4,7 @@ 'ENGINE': 'django.db.backends.sqlite3', } } - +MIDDLEWARE_CLASSES = () # Required for Django 1.4+ STATIC_URL = '/static/' diff --git a/tests/urls.py b/tests/urls.py index 080c69e14..28b9250d2 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import patterns, include urlpatterns = patterns('', - (r'^view_base/', include('xtests.view_base.urls')), + (r'^view_base/', include('view_base.urls')), ) \ No newline at end of file diff --git a/tests/xtests/__init__.py b/tests/xtests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/xtests/site/tests.py b/tests/xtests/site/tests.py index 5d9beef39..db5ccb81a 100644 --- a/tests/xtests/site/tests.py +++ b/tests/xtests/site/tests.py @@ -1,6 +1,6 @@ from django.http import HttpResponse -from xtests.base import BaseTest +from base import BaseTest from xadmin.sites import AdminSite from xadmin.views import BaseAdminView, BaseAdminPlugin, ModelAdminView, filter_hook diff --git a/tests/xtests/view_base/tests.py b/tests/xtests/view_base/tests.py index 8d01984d7..87447bb9e 100644 --- a/tests/xtests/view_base/tests.py +++ b/tests/xtests/view_base/tests.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User -from xtests.base import BaseTest +from base import BaseTest from xadmin.views import BaseAdminView, BaseAdminPlugin, ModelAdminView, ListAdminView from models import ModelA, ModelB From 335100f43a3f71b2892b8e677b3a0a2b09f75772 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 11 Sep 2014 17:01:19 +0800 Subject: [PATCH 011/180] Only test with python2.7 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c6253129..192721392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - "2.7" - - "2.6" install: "pip install -r requirements.txt --use-mirrors" script: "cd tests/ && python runtests.py" \ No newline at end of file From 37904afe7143d84e2a1cf39513456d26c38020d6 Mon Sep 17 00:00:00 2001 From: yuzhe Date: Thu, 18 Sep 2014 17:51:34 +0800 Subject: [PATCH 012/180] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlist=5Feditable?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E6=B2=A1=E6=9C=89=E9=9A=90=E8=97=8F=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xadmin/static/xadmin/js/xadmin.plugin.editable.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xadmin/static/xadmin/js/xadmin.plugin.editable.js b/xadmin/static/xadmin/js/xadmin.plugin.editable.js index 31cb89f31..b9c5b9e20 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.editable.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.editable.js @@ -127,6 +127,7 @@ $.when(this.save()) .done($.proxy(function(data) { this.$mask.hide() + $('.popover').hide() if(data['result'] != 'success' && data['errors']){ var err_html = [] for (var i = data['errors'].length - 1; i >= 0; i--) { @@ -144,6 +145,7 @@ }, this)) .fail($.proxy(function(xhr) { this.$mask.hide() + $('.popover').hide() alert(typeof xhr === 'string' ? xhr : xhr.responseText || xhr.statusText || 'Unknown error!'); }, this)) } From 9c299b496b12742b284e6a4210d11586d7b0befa Mon Sep 17 00:00:00 2001 From: yuzhe Date: Thu, 18 Sep 2014 18:10:08 +0800 Subject: [PATCH 013/180] fix --- xadmin/static/xadmin/js/xadmin.plugin.editable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xadmin/static/xadmin/js/xadmin.plugin.editable.js b/xadmin/static/xadmin/js/xadmin.plugin.editable.js index b9c5b9e20..aba28b25f 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.editable.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.editable.js @@ -127,7 +127,7 @@ $.when(this.save()) .done($.proxy(function(data) { this.$mask.hide() - $('.popover').hide() + this.$mask.parents('.popover').hide() if(data['result'] != 'success' && data['errors']){ var err_html = [] for (var i = data['errors'].length - 1; i >= 0; i--) { @@ -145,7 +145,7 @@ }, this)) .fail($.proxy(function(xhr) { this.$mask.hide() - $('.popover').hide() + this.$mask.parents('.popover').hide() alert(typeof xhr === 'string' ? xhr : xhr.responseText || xhr.statusText || 'Unknown error!'); }, this)) } From 9e620d3a3bf35783419b52831e569ff78f99e8be Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Fri, 26 Sep 2014 16:24:38 +0800 Subject: [PATCH 014/180] Change default site footer. --- xadmin/views/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/views/base.py b/xadmin/views/base.py index a80fe4b9d..51c7ccef7 100644 --- a/xadmin/views/base.py +++ b/xadmin/views/base.py @@ -442,7 +442,7 @@ def check_selected(menu, path): 'menu_template': self.menu_template, 'nav_menu': nav_menu, 'site_title': self.site_title or _(u'Django Xadmin'), - 'site_footer': self.site_footer or _(u'my-company.inc 2013'), + 'site_footer': self.site_footer or _(u'my-company.inc'), 'breadcrumbs': self.get_breadcrumb() }) From 66ef58b5b2e4ded09b4985e3bfd024e22f2c14be Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sat, 11 Oct 2014 16:47:53 +0800 Subject: [PATCH 015/180] Some Template improve. --- xadmin/templates/xadmin/base.html | 6 +++++- xadmin/templates/xadmin/views/form.html | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xadmin/templates/xadmin/base.html b/xadmin/templates/xadmin/base.html index a6108196f..003503057 100644 --- a/xadmin/templates/xadmin/base.html +++ b/xadmin/templates/xadmin/base.html @@ -29,7 +29,11 @@ {% view_block 'extrahead' %} - {% block body %}{% endblock body %} + {% block body %} +
    + {% block content %}{% endblock content %} +
    + {% endblock body %} {% vendor 'jquery-ui-sortable.js' 'bootstrap.js' 'xadmin.main.js' 'xadmin.responsive.js' %} {{ media.js }} {% block extrabody %}{% endblock %} diff --git a/xadmin/templates/xadmin/views/form.html b/xadmin/templates/xadmin/views/form.html index 6f84b11b9..388a755fc 100644 --- a/xadmin/templates/xadmin/views/form.html +++ b/xadmin/templates/xadmin/views/form.html @@ -27,8 +27,8 @@ {% view_block 'after_fieldsets' %}
    - - {% view_block 'submit_line' %} + +
    From bee9fa1f2325a31eaa6bb9bf276ceaa2270529a6 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 14 Oct 2014 14:38:32 +0800 Subject: [PATCH 016/180] Improve ``base_site.html`` template, add ``top-nav`` block --- xadmin/templates/xadmin/base_site.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xadmin/templates/xadmin/base_site.html b/xadmin/templates/xadmin/base_site.html index 6b4be49ab..7822446df 100644 --- a/xadmin/templates/xadmin/base_site.html +++ b/xadmin/templates/xadmin/base_site.html @@ -7,6 +7,7 @@ {% block body %} + {% block top-nav %} - + {% endblock %}
    {% block navbar %} From 9f42d3c796ce509de187a2106018f094c2201e33 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 14 Oct 2014 14:39:25 +0800 Subject: [PATCH 017/180] Add ModelAdminView.queryset method filter hook, and improve auth plugin. --- xadmin/plugins/auth.py | 4 ++++ xadmin/views/base.py | 1 + 2 files changed, 5 insertions(+) diff --git a/xadmin/plugins/auth.py b/xadmin/plugins/auth.py index cd2dc3239..da6c072ae 100644 --- a/xadmin/plugins/auth.py +++ b/xadmin/plugins/auth.py @@ -151,6 +151,10 @@ def queryset(self, qs): qs = qs.filter(**filters) return qs + def get_list_display(self, list_display): + if self.user_owned_objects_field in list_display: + list_display.remove(self.user_owned_objects_field) + return list_display site.register_plugin(ModelPermissionPlugin, ModelAdminView) diff --git a/xadmin/views/base.py b/xadmin/views/base.py index 51c7ccef7..a63c3adf5 100644 --- a/xadmin/views/base.py +++ b/xadmin/views/base.py @@ -557,6 +557,7 @@ def get_ordering(self): """ return self.ordering or () # otherwise we might try to *None, which is bad ;) + @filter_hook def queryset(self): """ Returns a QuerySet of all model instances that can be edited by the From 164f2b9ddb35520097ff8d0df31ec6e3ebaa68ba Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Tue, 14 Oct 2014 15:15:25 +0800 Subject: [PATCH 018/180] Django 1.7 remove HttpResponse argument ``mimetype`` instead of ``content_type``. --- xadmin/plugins/export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/plugins/export.py b/xadmin/plugins/export.py index 06b75f0fa..895a30e32 100644 --- a/xadmin/plugins/export.py +++ b/xadmin/plugins/export.py @@ -215,7 +215,7 @@ def get_json_export(self, context): def get_response(self, response, context, *args, **kwargs): file_type = self.request.GET.get('export_type', 'csv') response = HttpResponse( - mimetype="%s; charset=UTF-8" % self.export_mimes[file_type]) + content_type="%s; charset=UTF-8" % self.export_mimes[file_type]) file_name = self.opts.verbose_name.replace(' ', '_') response['Content-Disposition'] = ('attachment; filename=%s.%s' % ( From 2c3706722735ac1a27b7ad8dd93e195a374d7fda Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 15 Oct 2014 17:40:15 +0800 Subject: [PATCH 019/180] Fix some plugins bug. --- xadmin/plugins/auth.py | 4 +++- xadmin/plugins/relate.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xadmin/plugins/auth.py b/xadmin/plugins/auth.py index da6c072ae..e7b0130be 100644 --- a/xadmin/plugins/auth.py +++ b/xadmin/plugins/auth.py @@ -152,7 +152,9 @@ def queryset(self, qs): return qs def get_list_display(self, list_display): - if self.user_owned_objects_field in list_display: + if self.user_can_access_owned_objects_only and \ + not self.user.is_superuser and \ + self.user_owned_objects_field in list_display: list_display.remove(self.user_owned_objects_field) return list_display diff --git a/xadmin/plugins/relate.py b/xadmin/plugins/relate.py index c3ac56ff5..9a8aab192 100644 --- a/xadmin/plugins/relate.py +++ b/xadmin/plugins/relate.py @@ -107,7 +107,7 @@ def __init__(self, admin_view, lookup, value): self.rel_name = self.to_model._meta.pk.name self.is_m2m = False - to_qs = self.to_model._default_manager.get_query_set() + to_qs = self.to_model._default_manager.get_queryset() self.to_objs = to_qs.filter(**{self.rel_name: value}).all() self.field = field From 1509629883834ca00ea6efba6ba24e40b743382f Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Fri, 17 Oct 2014 12:34:26 +0800 Subject: [PATCH 020/180] Fix reset password form icon --- xadmin/templates/xadmin/auth/password_reset/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/templates/xadmin/auth/password_reset/form.html b/xadmin/templates/xadmin/auth/password_reset/form.html index fe1b34013..1c3a38da3 100644 --- a/xadmin/templates/xadmin/auth/password_reset/form.html +++ b/xadmin/templates/xadmin/auth/password_reset/form.html @@ -21,7 +21,7 @@
    - +
    {% for error in form.email.errors %} From 5199d77583c1e396a104c444b2595b01f1a63c71 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 23 Oct 2014 23:15:50 +0800 Subject: [PATCH 021/180] Delete models action can delete models one by one use attr ``delete_models_batch = False`` --- xadmin/plugins/actions.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xadmin/plugins/actions.py b/xadmin/plugins/actions.py index 6dbb4cfca..894ea0641 100644 --- a/xadmin/plugins/actions.py +++ b/xadmin/plugins/actions.py @@ -56,6 +56,8 @@ class DeleteSelectedAction(BaseActionView): delete_confirmation_template = None delete_selected_confirmation_template = None + delete_models_batch = True + model_perm = 'delete' icon = 'fa fa-times' @@ -63,7 +65,11 @@ class DeleteSelectedAction(BaseActionView): def delete_models(self, queryset): n = queryset.count() if n: - queryset.delete() + if self.delete_models_batch: + queryset.delete() + else: + for obj in queryset: + obj.delete() self.message_user(_("Successfully deleted %(count)d %(items)s.") % { "count": n, "items": model_ngettext(self.opts, n) }, 'success') From fc0736a89caa887456f1104464d370eea0ce9a45 Mon Sep 17 00:00:00 2001 From: duoduo369 Date: Tue, 18 Nov 2014 11:24:35 +0800 Subject: [PATCH 022/180] add bootstarp fonts, fix django collectstatic bug. --- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ++++++++++++++++++ .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes 4 files changed, 229 insertions(+) create mode 100755 xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot create mode 100755 xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg create mode 100755 xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf create mode 100755 xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot b/xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot new file mode 100755 index 0000000000000000000000000000000000000000..423bd5d3a20b804f596e04e5cd02fb4f16cfcbc1 GIT binary patch literal 20290 zcma%iWl&r}+vUIvFu1!7?(XjH8r_pdkt+yM3f?|%^(0BwNn zKil^oY6VY{-1dR0Ma@N z|IbPR0e+! zN}8*7O64;}N}#)+k#j6FO>isk@k@Bh*}4HIZ8cU{OIG{HQ=j2X*xT%?IOBQpvTZW7IXToOwNzo|ejHaAwCN3nOc7m7e{ub?Y8i z9p3wwJ(%iCu~2*Rb;zUJG0b8esX)Om9*+v4m=T(1qO&}%tozG*k;kT*-plt){q_5c z=|<3=s%J;+5^v+e03X6T{0`e9cT7ovP0397X+n!3SBptlDu2Z(nI^J_Nr|Uj5|0C( zsH7C}(vTj#)-rQv+n%XGE}df=E4Dq-Cn{|U=>@EJ_c| zjH;t!H%Vd##NLSe`rbIC2J`CayTWN>e+qGMY?nW2xD$T@W0o1?#bj;oT(4;Ir)pP{ z^zn;2#~F`ftb9z2k;^GdMPH0idXNQqUSan~vmdnPn3s3%SN@Uig6OL<*X8N9PDVh8 zE=aXkd(#~a3H9B82wp6U3u8FGYoX^x7PGE#+vn}?O~tkn>Tv{iedtIfP8&bwnH1VV zHel!dgTT%?xmK)jRE{TF1YFcv8fD@y@1r@D1{la@9zHJ7`jjIgzd=oiWYa9mwK%B} zy|CkRB)J0JQ?mos6ANjD$3j}@!PdiZfx7c_qb7yN=?6t6lXA%0bSJe!ZLD>cF8{8S z%zc;TkETPxDAFe72-on^9wD-?{q;2aQ7EWrbl0Amd#3unxvqn|JC@Kd#!m zD3%q9>q$Qjsg=pC8dMY`_9rchB1o3(Wil)(sF~w)ACOx!9kcmc~KuZIkS}MR3@?*tjUUD*Kz; zVJRtiRB@p=gjxTAV`+L&^tE^C(CQRP!Bw(!Isen8`CL+pooh^+*%S@MaWSk4#@}gec|L# zB!X*xUXp`ho|VA`Ll)k5apBn|b=s1UHqG7d^9|e>hRSD4>#^tOx^prUc@J{d%&V)s zyY~ElJu0~3h&e4W4aJuFSTzpP%#yYGoDnZQlcGs!Sg3eGz`+OyUM_5xhx_aB}(am3~y@Fbd#1jSgAHpY4(fcua7%fTYkjZoq^$w>yI73S7BkQ1zBQ*iajFGoOY7aT zzym?U;sqi*@>@XjVK$R!N4;+s1}+_7hh#pIAi&zsu7a+Tcs_f1cA{riJ7EXtqe}OCX@Dh z_f|1w0};t&!oFbeqQ>Lt^HffBG51nvh{2eY!IdDfs2x$JmnI{NjEp}dg#0~^m;ss6 zXJ7;ie1$Tx&O2|BAx7HM*LELUTp^FccN>14vS?0SO~mDdR(Kz1v&ADl*5()&tDJ_b z+@dOWohxD|K?25Rk-p3BrYx?pHa=UHhLH+$a2v z0*lz_@ZQ?(jQym9Dh+*AdID&qXcvK!Hx+r&iMJW$!#=gjdu8F_MJD>^TM6jRMM>Vg z!S-620)nlVDK%S@o zVLA)2Bvp_i-Xtaw5s~w0SW+OyDF(zG^7#$KEMtJFy#5T55YJXt($Cz3p0hF(rC_Z- zHv@_nQCdp*B>WeEzvjk(hKOHl%Q?dl*%cafGod7Xvd*{bJX*;Htb>D0Pb^4L3-A{% zdR7bvem7@tj~qGhy!ae@4i|!mQ}SKuT!DaHKU6r^w@rn*iP4Qu1y(*QIP+V7lp zV1(b5MRgtRhHiv-Dx8Ugd!fVL!O%WuZS!1vM5(;b)(|e-=OX{Sh@G#mg9?zY>t9S3 z(gc7>upu=0BZdi5xMs} z!4nO=`(zd!`DFqv#03v{KtD<27UqYs3nh9o?!_dr&ryAGG&*Mex~-)7B`U4MFO0b* z#dL#X5Cs=Ve>Pz*#jYt?edt=m$NcWvP6u!Ds+`Caml?OwqR<}7R|c5s^5Xdcoz62Q zly*lMa2P(pt{L;1;Lwnbip6O*aE_!(R6%_fvb|cO+dhpZ+S#9;qxk?7K$7x6K+PB; zkUu8&@PQX8Id0~eP8GwNrDfWe+>XVCZ_%`TPoG%{uGsT*2@zW^@~XhbZj4OqFIC?A z-Q7P4limjRUNt|AkeZg{;<&Y<`$m*tc7W(N$2ydyHsC(=F}Z5qZel`_Y+wRqt>tID7ycuVB%5tJs&tWbL6 z*O&Xi?9gg5DWX9bLog%x3r9VJF_D9xdyRp`lWoa0&d#9ZJSUL8&d#|evcRL#rqZVO zJNC7MJen=e9iT?{{;z2g+?Px`EoOq!hRSxz;OXY0*APlAW@ma^B~3hN5%Dq8pTKCOm35VonBfC0 z7VRQox~ieh3BgEeC}Hoed+Bdi05zmVQ}_hwg&3i1@?^6ga0|CjtXY|I1ES$jrjV_9 z+akX_DI1EpwSls+{=AG3R;R9)`kwp2mD<*+F9l8cN9Y)C(b571U8D?SjNd$un*W$^ zQb3!O63^f(-w;Pb2aw7=70LYQre{1Y*nT9U>C1`lhorT&pev|h>j*t~AZh2TQkd6! z#nAOK$b56zMt=0)Jn9x+zaw7D75Tq6g{;UcRPQRvYviJAJ80kI;iPgq$ZpUk zv``I3NMn%$3RND;4o3({ne?g0v93`9qqBXV=f32tj+&*#eRvX$Z@Uth8DvQeA)7k6 zC=w`L9G8=)dfi3V^Sex-qDlv5@QSVUhOrL?(T+V>?S?|u^xRB z9AG`U7u_rYVxUM4WswQ^1X1pkETpecH5WfA2zpx%1%><#Eo?_bZ?-X0Qt%m|XPl;_ zu8I53WU?v;ubySw*KR9?Cefkz5=?E0K4| zTIX~w?XR31GOY4x$A}x~rZHFPu-8FYyAkGG@McWucr`cY;YArWU`C4xS%D)$`Y6ro z7i8HK3a*?2$uhrt4{XePufp{9W6WckA9@bh{Y3T?uM&VqbX`Zfj~6&}B@IC4`>4&N zqglD%fv{0`v`z@^T?zw}KP7tp zF7`Lc2c#!8x{#QI{rL$0(DQbaG*YH_VNq?ZQOAZZjj<$*-7xcdGwRAhh; zg>R4Cp<%f4%j;^ij_HAlt<2B4s3%j>N=NR8>aBystt*@e)DHTKcITN8ktnsR5}*@+ z@%3Bn;UiMu>6<3X$qn!?>#yYMIjVGtrU+)}ll`$fZRnpf9?5;1!W(|kNp66|d|ffe z?YG%#3In=mR&~v%>d%O~pK_F+z*+89qHt*GAaB>dut}dEj8Gmjv?hbcZArt!ex3x5 z^7!L@9-AUTQ>Be)0YV`|qwa==f3?+@!RyvsJt?3Ev0;LYSnc(QfDy zl`S2^SAJ_k8y5u!T0v ztGm&;m^5KC(joeT)DpKxBQIhf@J7h{OWN_noT|69zUbm6{*tC%p`JiU-dKr)YsATI zt~kSw`fhSe=!_Oc)TmUD;@J`4K`SLf3&o8I&d*gfnVw9&oqTVj7fmXe9`O9{LyWR1 zLL}Yyz>YdANeaRw-f_h+2W6?H8cBJysbm{=Tp;86oJ5uKVDHdnpKk(ZPrLyaGDw|f zj5gh3YE|3GCB1q9C7`L5S{;VLCDQI3&tsVS`2$2%#~KPCw48A1^d43{ii<)q{0hoD zRGXP-^qjFZiIqPEez5nzpT}(pkw%GvtamjSnQTfb zXb+xMT_RlXhT$vBv4_WTDCByW+MI%H@T5#8RIM7TX&}DaAp5l(jSnvJ-Db@DCgK*3 zKE$ippUB=Oi{XV)L7cZ37UpqLEs|1h6~U-jL{UZ3ZH$@?AFS*|h89Xr>EOon9ufvS zURA%4n1Vh+e_*wKQ=sLc#tKl5M)pJZw+?VcOGaqf^-JNz8sXWEmkvTY|H0AWc6IHF zv|Qd?RK3me>{nH6ve-QMqnjwW)B(;Lwz+AB&35THNM+Q!;dshRsyASi6pLd!AzOek zDSvVGq{wReUJ}JYK6rcJ^}OD69xJunQ_y~$jx zEerlVAfD9J=U|fVI^G&Hn?&shBnczCp92sx-n4LXL|r2mV4scT;9gu@*Ylcu*BnSC z;@J^7^5PfZ5yh1kTTE}ODx6Kzq2H(5M!;;XPIFlSJr2+hI$Bl z+!0xVR=6Z{OH7W3Z1?YcSriUR>ex@Z!#z=QVg>Y6vyyCa#Y`jt<+zdcbQ=D2&Ao;u zVds^;OJ+JKCc-0@NdR-go(ZsnV1DgO0{MwIah{EJmAZKttG0YO*W{7peKGx@ z8!RPp4TXkW#9g*d0&@&_UvUWRNe!9E(2jU&M7hl<*x^}DjEi5DEzuDMLMAa(t+T+9 ziE>FIvU*Auv|EZa7TjLoG`1p1=2tm6A|%3*#xEKe)^LrXXvlgTSbNnybU#eL&z8bV z>)W>fNRO88bpPlnN!k;c4;eF2)(ZVgq zI+NLU?PS@WVb94?&DQuLNeE`k6U6hoI#UEm;?7}3b>YnQR($BNMju{qh5D6;ge6IZ zBVH!tT@}BpCBowG@=nuyq4^zv3uD zaz9KxlaxGy^VuZh+N5lW1qb_w#1MIexr-L{sL_wQV)gSk&+mHd{pg0+x&}O|Nn_Xl zo^%uH4A%D(0y|MfQ-3utC%?TedJ5(uK;wRRSD1fQm(ga&=AuGH_cpk0rfnluYslzl zz5FOBDv35DzC=zE)LbA(tnO2l=wh(6_~9hZ2R4cdkuTk!jKSkd1;G8Jx)5;s$_qFd z*_G>Gp-wcLibH$rJUzfT!-2c%9P)t2VTWPtCr_t;?)ZiNICh#@g^k10el6)>91Xqa z44gu;fe+QCuBY_GKdHZRbwH!1JJ)wZfBqvB}U(%}4DReR)5pu;yMwumQYH6=88;#?HtFk4s zhI2L0AaB}Afm|Eq7I+7|5@s@kIuWduf0gcjr|l$3KhfIKVb<2U?_KhzB0wLQ$$zsn z_!km;#@NoPQyX^iO+e~CB?M0W$nG4KNwlEGcqa7Qk>Jp_V zR}Vzd!h87li`ony87U;pUiNkqVedNiRAK+Y;m2J_f4L}5izq|rk|@0SXNx|su)lKz zSr9;-Xb&9BVufgNQFGAV^?qymw$MP+V!oob0Pg)OT2vL*_!l}ZAh?zkJn9M4tQ6?>L?25H;KLXE z+ACml;kdyafmW-F5pa?s1Q9O^;t7R)Ur*iw9xEORh!$}h26~ug}p9e?vqjbb>8VVp4;iPIR80_?n%edz`dweV5*y%#U+-Y z>A!GP?b8@lDbbbk9Eh8Y31Z?-o6#wsJ!~B7g#v*k2fqHzbs(fE*%JB%#d)`GNakgD zK?-F?Q)6!-A?1xFIgPJxItTZFdTlM3!lzK))wk+YHGRz(NA|*NGi!~WRFvu%>JqP0 zL__rFuWBRix0HnGY51aXGAHs>(T4cen*mJyPmvLGq13Qy z<5f*X9N)YYL@7#gVZ3hb9<``3zwUwSahk%h0;?_*dF)}y9$xJpR1e2khb9M9cGNu* zuDx2q@)!(#*sP+V3{39s{g=Ve{#?8k%Ajg3qGw7*+s}MSwZXs^4eMDnM1Gq#Ah4wA zP~$M3fdNOS9OkDwt^8djKrJZ|{x^1d1U}-vrA)CR6^0hQ-^3;qDwi|gkNmq`jLK6I z)r%2htZg#gn*0mcWb=s2m1|}^iY07>eWUBR;7RHD=Aml-nIpK_xE9nlXZfcvP-!+) zH9DHiFTpUICV@nsqssBrR^#a+1n%1ZQZjA`qIfXbyX2FYi$D%o#!R1* zOxTBAW-^tak+g2GwZR{b7lmW+DJY`iLY zMgsRvidd<_Y|uI2t(q+web&~r;ez4>o~+msHXXIzdkq+VLXeLidVBMYo5;$GUF5tmbJ{~}@;eACae`pZP-`~1RQW$Ppp`-@sq6o`-hOO;0BFs;f zTn+NTB1+d17aPP&&5WkxRXn~USE?Ye7<}zaN}ug;zC_fmJ(DDq^{cr(;o^RH5sOwJ z=51d=R$lsmZHU~F)YI4cHfJ*y+ zdUnyrK5^G*l*2moA1Ve9cpV;udmds%_w{-Iuy??HoI|HUt4|l*nD+}SS!&9AxT8Tw zl4=hmJ2Ce8<62i-*qn0lim6+)+~j?n?MiEw9~@ovFxTw-DQD3dUoFc+iZE@w5CXeN zBJ2C?1y7{DBMsHZ!JFom6Un`#QGBb!ELH~Ka%TA_Hx{VN^Rf*bb1DV9+vv{OnZz+V zV6ppnYAJ|X^bFV}?tWyPb((zyNf+&$6Rwqg1W-XjwpZE*G^TA&B94m_n-eOeF_@TK zOLPqKO`}JB`=fR66b-OAtUo|5Am4U(;9=zsOe?JTs68#9u8ZG`_MM8gt6vA?d zJ)8FAEifNZN-E-|Ly)YZE)KC$Y5EIxLsoHq=@W_;Hnljx5_1T-l<|^mi->+92=EsC z>Gi-?(NRWV6KDf?Ax;{%O)|MAQa+52O8E%U*%F2jU9Hk(m+mAF-qJ6m0zekjiwm={ zR^tr;bZ9R|dDQ+tN8~&olv;EYdXI>elphqNoyKg(JO})3;UyRu@vi^SZwvh))^G zf2+fI7c&$PT$)6a*65(Yhx<@ScYC!!=OP_Ol0HDczg48Fv5u0A(};FNq$;0W0BJcRIl84i`V zP0z@;ZV8cAoc3JRP$#k%+x}fM%D4HYNVdF&15UDx?QvcOX8Lur@uEh&5Yiocmv z-NZ-MZ6Nfg+^#6B}o=UI^$eevG{DTsh#u zq_Y@`fROO$|4N) zBNay8QAIZ%jNlhQedrZmG4s!HYM(wqAvM;zV@3z*@JYT70#)`hlqD8sj4#z?=4exZ z`X6KQ%`dqvYq1JYUue=DvWq56Uvh;|^5C(l0zYs}Su@=>=Q;jY)pw4jYUXIJv9N~DtF1O&K24+jCm6-n|6OazGa#KTwKR;X>`V4oM#^F zPb5FJsNZ?*#Z0_+f~Yw6&HB{&E!evc=wRT!1A@iG0XrP4dWPE&12dbOk;2EL+Qddfp;@E9j3>u_vR{W1VUT!+k0N zud1?Y*(sg4$YrwL`;0X=`h`S5?A%+bkn;JN@wX1gB^f6<0hmT?i1QOWA%)SOwQDWs z3c1)4juq3@2D)!1$NAi=*rrVBc(RT*4fhECLHwfmKhMNaZ+7)10(#WsJp=&;KxXk~ z84-d{dIYbqPJJp2z3K^fypJ1nxtaw2+#`+f@w7`8dM^0VPKQ6Mut?EOdiwm&5~nDJ zaML}}&Req>Nzmn8(3E1Gf5c=`J%_Ym;e4TYB65h;5l3lLk-+Rvr~1|k&HJf{h(2%d zf#c=gm*63P&QEYVyhpYpls*XBAjx1Rl_faaZc#vJgnQ~ObkWZS*CY&d_1zV%anoUn zLpCtsC}tKx-p&^LBilUX#mf()Bj+rY=K3T_vzs=3XnRf#V9%gFmqUywxG!zm4}IO_ zXI3LHT+}`?8D23`haQYvVFG8W;!@kh97I}41q4M|1Zg}+t)+nU2rDrWy=KA>p|_Kj z^uhJvL7{k(Fu{1?!kU{mE)3q_jgG*a}A;J;E139H^FZkTc!@O4&7ri69#;fB?fVASr+;0aqPI1wkQXqLZcHTZSZ3k zT7~n;^!0YF!fK(?J}BrbxqnOIZ~jAt{-c5;6=AavGDvTnR+^#IG=HvmWdn+gsLX_% z8q0o#7^;7prL)u-zopW3g4$58c`3T+WcUdS8sAbzUqdG zWnC3Yg4wYvD*A9FDRt;SsI7Y|Df*~9LuM9Vx?va`!G`rRh)=OlzOoHL30=rX_%$h& zd-4X`UNHH~fKbAxXR(}!@rBj>tT2zhjBpW#yU{cIoTH_9Dg z5YIjAUWkxC)MUZOsmu~?f3-Nh+(lL~%XzEu?ax&%zWWqCEbj0B%A}x^n@6JYBMc9$ z!s@TLcOkT*bpd}MpA-qz@uySP5EWE+638yMt1O5yTVBX+n~7O7*TF^i+>Sx;Bzl#m zP$1U{&%8K@AYd4fQk`G>Qco(XZ>O&C1Se+eXz@;p4Od>_ev{jElzQ|=q5R?^bWn^J zbA;Cut&@n5xmI3}T!xr)BwbTtoZ}4(oPlIfon_dflfQ`cELaIAi|v+OAXU2qp5!el zmHgvJ*+z^bIMwop3I3?j-ioRVM9(*v{YAzT?cY!E+#FvE+TwN}Ij#nJ?xoH$eCoLF zQ)?HbBCsw&&ur}i&CJXXq|Y&7j=01Vi*-!zJF5EeSpW^{M^PTWeExEmcH<^jzuLHC z!bX8vYga0HYZe{HTN6R^ZA=j5Mh6U69o*>&|L-yL`)>Vg)s40j!f*rw27fwWJ(jfs zOhSZPK@x_Ij~_On+Rii@baZrKX)8xN1(;gqk+-&C+;T<+2N_f91t_tm@j$FXMue0t z2^_Q!DDZ>slQ%t($tG9`2^yvJng&%C8a2MMB<{_*OFnlQXJ4f8e$B2WkPAMUo4Teq zG$5j7GSaTxZO+3+@{0z-lBB}k&3=sZ-@wQQm`f%PQJG0g^Q^^{!s>Vo@_5C{FCLnH zuQfSGZ5_HK5;o`U0bX9yKS+(xR3%tjIfCNN-y|pDxWtH`NI-3kOT8SAXcs#TxX|Tb z-4gImTme3ZCVGsD{R!+ebgH;n%EkgGr&&d`NFg!c~sI~uyO4$zHb&OSNls_}o- z+C=Ll*8_*5mkNW=hi*>?VLq0R)#6`e z+4)w1YS*6EzhoeupC64W=qCM$na5+QY48**iVLk9;1fMrF&4qzF7qFY1C2?;a{(V$ z6W8yhFQcHP(L-K~}+u64~ z#eq_Er%r`NCT&?mIO4HznTrcoO}b$7@<3^0td0Tdt5JzOct3}hO$*^ssednwqH7-L zFiX4h4#56nh&ELlRXbm5px!DC+P;$hYMLbi?t58{75r%TAgrd-1tcOqINykZxLhA` zTV`Pag@$3F&A1A+2H_9(fdM+j-ZdVo=YZ#E%2c5{ZUbn>?X~&$xaf7tSCn*OrrKYF z&*IS+F+`T_W&w>yQ`FoQJtN(uTPkLH?m=b6&~zP@pJmL8KEr;h!P}JkH2BlPRwVcY zYz>GGen9nTRMfcu30WA^HbVj4^u(V%<$9=K5N$c1Q|D*+HTgBrh?Ql)IFsi_LrE<% zYC|!R!s?PIB0L7%P5Ah-?veGq%ciOF*3Fv(g;9~wl8}j%hI=ng!-B1?#=Zx zR3S$auy_38iR6Ad*rL9j)HZ=j(~cj-!hJvbI7sM?E@+T^JtOr@XE_!oXlUhT=JHLbW()ItXs^-KWvZ0-yLq z$)>gyz@17ERGLu%*`ct#t9lo}u1 z^tGoP4IK;Ha4qlRaT5F|D(Z0ir$m^n7Q_X*^Rj&O)j6B00%)q42>GLoBb0dLQbKsh-(ohcln$0wrN;M~snY%70A3W?5}3;2iuC+~$}ft7J24Wr3L{v4u#N_mI<45iMh7fG!nCehN>#LJiYm2bv8m8gzt zIrQg&UX6;HT&qi7?313!{WOwu<&Z!1`++{St)j4V&t6~rlX27%jU~%)l3ZR4W*QEu zLjM!U2xX}Xbc7uEh|T$#iseSnWe0(q{MQKyYwUHr^H{&EXkaK*FdcdCeS2c0_d^9P z&w8iCV66w!kK<$p+7E-;-np_X=3LIQ%&MBA9k|>q?&*PNCeL|S#!$h}oBBP;v}{d| z1mNHd7Ej6eu`uKm-dtoEZ97BOBuq^@#%R#0iWVd65j!JZE*yad2c~gFundN2tZd>) z(YGp68{k9GJU>y29+hB5DWk+u%~#1Rw2+;?hCAUE0r+)vtcYPGg8f4!+x!(OUznyK zHN^;Gt>>c@jDzYGdlR@AOX_yfv}cfWcnyI2&vLY=$u_Z5xoM^AcUXSaleSkuUn4mq zoT9j!qD_tgRfed%mr2Ji=uS@0hUg+I(cq5v$KEGPWF-TYSu7){rj`%j1=UAUYa16b7V35rD*-1~rVuv1Ao6a#_eUoun0p~2u;b{ck z2$}`gmx>rBvo$hQDELn~&vO8Hs|8kDg<`e3qUoXQj};QW+n%G>t&>~h+}bGNwT_E2 z;2~^>h>--fX}?zojasSO5~j|}Ekx0bIdBWjGAVTNO#17i>y@wd$e;1L;dA><*-Kob;Al77?>E4Veden6k=+q+*qTEER7f-xQ? z#y*Was|;+B_@C{#Q;KQdziWRrdA<+LM+tiVa!Y{}Sh1IrCR%^fInaP4>gUG->#AuX zjqdat3{P1nulNJDpqu>~m=@e_cU##*)}7?;MU4a$^q@T)RCnQ{4}CUcZ?h`V&AZV~ z76=EnVLgdu2av5T<|TW2(!FQS!lIyiRBS83+MptXU|(NH=Mk?@9^;2YrLOC{n9VBs?+;9F8K*K_J=T2xyM=vrD;gd(U6#iT~!Ghr~x;_1@j z>0;o$yM;6eQkh{%cSuIK!J#Yw@C)GdMG*`LmrdT5ogVexE$a&CsR=JLJL|^fX_foR z8Z6^m>&irEj^ayYEW?|=+nDUqTOO&d%j0u$tY#^%OwO5`AuQbB_;lR!BmZ9Ac{94f zy|gDpA@Dq2`Dc9ff^emOb$(H`9;^z3q(smuYPB$2SH-0{x28^4jxQHP?G! zgs{N_a=~!@5Cj191%y7^KXp4YTh8*5MJ~PBuo%vkHKPpX(T6j<`|=YKZS7}1BHYc4 zRYYR)$9wyFbBWFJ8=(~CKu=q}24^kRzav_3KsXBkVFDY^We!1%WyFt}6%WDb(4y@* zY{RF};+QBJJ*-_x0|pDMMwj>vO{V9v-D>y2q?gC8ZnsbtK!?k<|NLB}rpONie;-!~ zULiEe8f}p)og9zj_{r~t{->wXdCs_=gUJo5HD>VMBAK+JhtMg3L@u+%FND~1$xr}6 z!rBFcoGDf0t_(~VAWkav_o|NXF7WY_l(WL)pv^oZLDED_ZS!yF*VjN4`M~Z zi0|zInq6R8NmWofV3vBT-~(GKAidw(0Ur;t1>XA6pt>V-Ih{Tofk-#}RH zzj?|R#0zU52i3Vv3pauBtn0#;jA>ULW--^uh#Id|>jaW!i+>JsdvnwCdyz4vLm!Ar ze(-+13RLFNdfM|NM$Y`n$x&+tJez0P5^A@sDnG#_S1^%9hAME1Mqy5Pb03FXZ(m>C z2wwF20;VChlC}i11d8=a&tiY1UX;d(>@Ijkb88lhfg|_|YRc?HVr>3o7d!jaS|b+4 ziJ6Fe!`)Zo;f3{9iyvHa?Dr*pICO>@Ge;3digR~%;$1a5o?>&$t{2X4TdR0DqE3el z!6#zE4La^l%ZqV{vz%n^5zh)xikq%s0rO8z#jxuTvugd{(E8Yx%&?FH)L7mo5{*Bt zWkM2igxB)zKJnBQ(JTExJ4-n+SosT0>%R0RKu8mGP!auLRDWLz3+i_xb4gwr2~dlZ z$?UEknv>aVeLfBqCg03nTvh&XXI1#xg+ia8g3zlTcRlR_E11}+|26nZLJ2?EMStB* ziF%A3V{Y@l<}7SoV?uFW!j~b-Q+rsQtl4>+VA7A&92*XmNH#9r`A)w>tB9|}Pi&PF*=_hPPT>2tK@N!o( znmxOMSyzh~A{K(Xg)fwXRX4-lt8J&eE8nzUy{Is)lOj{4t9yVgUCS`TJmwGmixsD&rwMrbRd2a9mX3l~@M@)hIfoEczZ)Q%%3!w1PQlkw;I$;DH-p}gerBL(C zktL$vDY;cvV-c89B%VZ_z9~AaNsro()_Q%~jCRO?5S5;?gzPO7krU3~7^G$)gkH~4&@ExJtAv7+ue_}lFOok(|IWILUV z(vXN_EhF|k3zIq38-FG2%xtvp>HIU&45t;2#P~ImWyfAoJi;T9ams1ymFZHNR}Qt& z<#a>(u9sw@OG0u{pEPZWuEtx+%6_i0a;uO1Ut5dBK?zn-w2oSmxn{-$oh~t2@u0=EKGREP- zrntA3>-vUf!}d(apDmZu43VFq(NSR^nDv?I#Qy5p7=m&qOeZ!?JUQ~vI+7^w@gAv6;->Xmp5Vs^2liIpRew@9XrBud~q6m_khn3Thf>)In@o z0Gum&2Z+7;ItnfB9cm-0yf;#y7AY;65DJMy$DMV_q7IP-5S=~y1`wpA-@(KulqNn$ zHkzvwoJtLqS=NpXNx(8)WTPseC%wj&Bahq;5luD~JB3 z(ABw8XA|{_{`*Gq_-+usEflc<#w++N$~iwF;qQq1Z!aPJ*WqnajsrIbM>4?WEQg1J zq^ak$@my&Ov`Cpv+SkV3e!O86Pd5M*&t^s^Q9}XU`|`_=`_+d_8h2t^>O0nWqw{NV zSdNV;Oq6u*=Q@@LFW`Zx{`AYrJh5H z2vu)#dvkuLE9dmG(1epc#jKaw5XR}lyArTvU>flsV7C|4JS7=GF2#1$!1^*Xbj z)u^I1KfL$Xln&dlzQ$a$ZA{JFb<#NwnnWsPqgJp2VLP6FY=9FNz{>`Sn7zFYjFoCN zXO^g(>4R+U$Mi<6$V3n;6T9EBCTn;5$}T&1GMczSw4eNW8X%4fVQ5m_j(QIY#wI>h z`VINL{~O^(kw=sF8^1J}igZ;3)-tlLm5(xT>W&r3VmwP+2)p4c@jIca+sa*D%wqjJ zbx^T>e7p-+hO*4e!C?x|LTSk#1AqgI?*9sH4wCUwX6qeE5NxOr1a=ZyyCs?i%#Q3G z$tj90j)M#jf{_I6FTjQ z9N->Tmlqw*c=ETW!MW(9Q%G3SW&M>U5hg4O2IOoGxdR9Xhmf3fnGjRO4=GqwP0fHQ z>KMVfZ1|NW`?Zl0m^@^Q9||T#8achkk-KWyJ^ZXVq%b89(>kM<7=JG_vqu;uk(51h z0X-S>0T5h;#7<8T>0QE8iDks-0LICd4T>ROlzG+9Xo8!bJqw;WTFkGtV&{sB+A4}m z6k0Tk$SL0imR6JxXwS8PloSZ!PCrrF*on1-GeMg)(ePP^1Ny9vG*(E1f@a6;h#R^J z0xU(l!surA&vgX>Y|WwCl-;GStYn_E1BVe}#HCERH;7|kB@p{21VK>Ak~RVahv4sB zf-K^x)g><`2?LOuh*)b($@|&SPuTLjSx~hhjwaH0!6XDgfipwYf@st1tStg?5@ptC z>tW}Hbqo!;He#C7Eg<&6Xm+%ON1Z+k(;BkAXk7tX^H30x0l|dX8TO%98*!y$MX=Z! zc-{DNX!CU&%ut-eG!%0F!=umzBhy+*5SS@kZFveI->)wxdG*Px5twNOOc6*iMBvOR zym(hv?#^E5QKkaTt&6gP*fQDAe z+X_I+l*a%Xt1QDHNw8{%J>7Q&Ph!0^tC|=#;BpKh^ra$iju5EP_%eQ#?0vFiiXS5> zKOvKgFWw0?h*t*-8PH23x_-(9IN(h_k!988=#y+q)(~7n->aUESF{WU6inI1opw3` zQl$+%uArh<%pIK?5u$KYhAkGtlE5;8GEnFpsL+u@Hl!7ZRa<4*rnxs4c$8AtcQmQE zha86a=xDMxZRO9M_!8IU)xGi*3G+GL3^qt|6)PLF%7F(&(=$|^!vAFfJchBb zBwwK*cUYjOh1oKuIDgz!SxpuDgUMULhk=Bl|4fOP(YFO)=U~pNLFU_v+w64W@-)-Y z;duK3Y#$v>8Dzw zr&!-d>hkPHu{x!yz$n9%6`MC!PzmYcZVXRIDPm*@TGnI%nWBLt^7P5D9cC!tJT7~@ z$~rc-F!FF~Qa-8K23Lc*8F5`d10N(g=z~6-SIX^rNZnrCVmJEmVp%wAw5u+(nn(yD z-^0For(b}~vA75L4?M)H<4Z6xU|-OZZRr%tw9gTunKqO8E_Sp4NuV+z1uYpgGg6^n z3`a8&pR4d0%A4xeVbbNIvt@6MmKv$vE+GYyrVQ2zO2RRe7FvZM)J;@N?6T20;3H8_ z4A9g!MpGrYfl z@lhs7b9a3iq=%3zP(`dDz)S)PEc+!`QA(H!zt^z&paFi<+e%!H@5zKng$u;&eISC2 zl`3lA(A9RvQY2pK9u)iVLcmtWxj>t*nm(v?uZ3O5eCFlA&8%n%#x57IF%E#QADF>*MpK6+Q z^FZ8kNn=H%aB7rD=(k2?LSpWW?u&9QID;f`Z3W|Ek402k;&o|Sf_ac1vjc+baHXyM zSU4!g@z4brfkx9Mw~1EHjV72dz>8ObV9}bkj!3b60?0|r0DE76Pa7Y(i|h1UeHf4b zU@1_TAn3v&B8Jbjvvj#_5+~UUnF&gHH+V+X%8^CXh-0pylmW9Lc#Dg*z6KC^v+!Pq zxk8!I5`i=@HAKp1MlXi^kf~iyHtl+G@l50v=4^)Yg68agN9Gdc3K{%h^Zy7G2-%;& zD6DVFSIp+dfK1hDC&Qw>JaNhX-_f}CV4u)x3?miOO#!6%%+u^8oJ1h3plIbnJvP0J zFhci|_6&QBV@)5FQC2n!lxne*#D%HH;lHSJCfS?tqC@N`5hxLXUc}DRzbNr2Vj6JzAS10 zfeTw=a2JGHK^G~_0x*p_D0GCat_|pk^IFl4td(ZPGZ;QyPKYPqK4A~hMW{=|aY70Z z{mO{iqt;*hnCzqeG5;y75&iRlp3C7sNQaDq*dwug?3oaL=|$}|S|lYetR4rKZY!fc z1jJV`e<>h*#!BK07QPfHjVmOPTH82@J!T)bVn?~%Ty}dR^MPQH8nKfRd)kE?@Z_OF z;(haE4CS@E8`TJs5o4JIYLGVO3aSZ%43L7!n7jcH04T744gi^;QDBLY$T~{gmU^B7 z&*ssFqV~AE7*R7b;-Q&^lkG3qEOc#6kU$}!-`5EuU{ij|h*u?o=#`~!Tw$rwzQE{f z1bYy~)1SgZ6elUxvLDF*7`r%n#29Bum@?5hFh{ppPN`DTg|l^quDkzf5K9PduwsA; z&ghy*mFmF(Ad{Hn8jro8BioW+VTg-lhYYj@9V2Gw z5c;UJ`M#gVP>2_eC8*TJe)4d=DktdDp5;}To6m6p^#i&)ZZ0zP0p}Z_RDL^9prc~0GfL@6{*z_S74P5?%7%ZEv!Fr9l9IujWbor^03<*96 zAJoN(_*>^(p6pryJrf{I{JiX#5g;o3z%*4KB9x>vWZ`v97zCk>`mTLF$@&ykCVT9S z40MWog=mf0ua%LAYr;x!YV6R&{uH)t2L!GQ$wq!N!KUav8jGu_jJI~Ao&K4^2j*QU z)eV}I{0d{zwaAC&d{I&CXe+8pk2r*&4zuSOulgI;GIh|XM%z|9cE__{B3s+!fZjqK8geB? z2FSP-hhQgcNogs?*w6<)_E}2-dV0V=HAPPBzfILJzO*y8ySTW6iT}z);GiB+;BW#%K$yXBB*%F1cD1bK6 z%R<#9LAsBp5Cn#;GSd+l)FpZbNj0!!w1N*=vwD={iWZOcw0g+>Fe#|b(J?L%SwkwB z3Y^*v3m#v9SjgZKtA#eneGzqzfAvUHab0^)1_i5}nknOPaqxDYgg+GqL8i88fVjJa zfMqx;Zo(2oi-Oy`3-Mdy69M7DqzKULf%x8<`PcIV)evWBM&^28&P=reWqnZq!`ij{hj+Qi^Y+m=7!!_#8K>SM=KFv3W7ql zf(#Y2qjjqJ1}neA@`sHs&2M^dIqd_ryiggPpNk(o6U zAr8RmCUVDv`Y}`Jg>IC1SOU-Um>OebWQ-U@3$^cX=a@PC2Xv#N*nMxuX%Z3MWyuc# zdht5);{lFmrJ1<}Iy6|#V&>ImK&0FtPvMUeVryH|Phak|%DKE%dX> zirfwG5c!54259+46CiR#=|i3r7UF{sL`dk2*)qpNS260^ID=lnH~a+n!=_*!c1KO+ zeLEYFMJ|vSr(yT8f6=T(q!R$-b@!krct(RK>41BP1dYm&R02naKL>yiG0(rirp^g- z-T4DY6?#NE=pvG@7CEg_HoL-_q>XR4Uc+8m&^&1K!X2|7p^}(d-9M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf b/xadmin/static/xadmin/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..a498ef4e7c8b556fc36f580c5ff524025bb11c84 GIT binary patch literal 41236 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 Date: Fri, 22 May 2015 15:21:02 +0800 Subject: [PATCH 023/180] Fix some translate error --- xadmin/locale/zh_CN/LC_MESSAGES/django.po | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.po b/xadmin/locale/zh_CN/LC_MESSAGES/django.po index 7b1ae13fb..05aa9114c 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/django.po @@ -199,27 +199,22 @@ msgid "Count" msgstr "总数" #: plugins/auth.py:21 -#, fuzzy, python-format msgid "Can add %s" msgstr "可查看%s" #: plugins/auth.py:22 -#, fuzzy, python-format msgid "Can change %s" -msgstr "修改 %s" +msgstr "修改%s" #: plugins/auth.py:23 -#, fuzzy, python-format msgid "Can edit %s" msgstr "可查看%s" #: plugins/auth.py:24 -#, fuzzy, python-format msgid "Can delete %s" -msgstr "无法删除 %(name)s" +msgstr "无法删除%(name)s" #: plugins/auth.py:25 -#, python-format msgid "Can view %s" msgstr "可查看%s" @@ -240,7 +235,6 @@ msgid "Status" msgstr "状态" #: plugins/auth.py:111 -#, fuzzy msgid "Permission Name" msgstr "权限" @@ -322,13 +316,11 @@ msgid "Approve selected comments" msgstr "" #: plugins/comments.py:72 -#, fuzzy msgid "removed" msgid_plural "removed" msgstr[0] "删除" #: plugins/comments.py:73 -#, fuzzy msgid "Remove selected comments" msgstr "恢复删除的%(name)s" @@ -1062,9 +1054,8 @@ msgid "Add %(name)s" msgstr "增加 %(name)s" #: templates/xadmin/views/model_list.html:39 -#, fuzzy msgid "Columns" -msgstr "列" +msgstr "显示列" #: templates/xadmin/views/model_list.html:42 msgid "Restore Selected" @@ -1235,7 +1226,6 @@ msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" #: views/form.py:164 -#, fuzzy, python-format msgid "The %s was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" From 8ad68f05a90ef57b58ca3fb096e7069b7c3bffca Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Fri, 22 May 2015 15:40:43 +0800 Subject: [PATCH 024/180] Fix zh_CN translate error, add "Search" translate --- xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 18981 -> 19551 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 182 ++++++++++-------- .../model_list.nav_form.search_form.html | 2 +- 3 files changed, 101 insertions(+), 83 deletions(-) diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index 3f520668ff2b80496d119b87f9c96c004c83cb31..f4f7980a11e13254a8df87baa19821b5f2dfdc55 100644 GIT binary patch delta 6350 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 Jt9*5<`!AgI>9ha< delta 5828 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

    D<;7p?IDerV-*>|tf` z5-CUiOx6-@5lmX!T#vwu?T(e};&z>X3WYbwZL*MP`=>|XZ)N_@ASLLmskMjUUGfg8 zNE(nXq&wM7Qi(SGU)9N2jWi^WZ{JWk6Q8D`KR\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xadmin/language/zh_CN/)\n" @@ -19,47 +19,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "管理" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "全部" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "是" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "否" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "未知" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "任意日期" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "有日期" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "无日期" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "今天" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "过去7天" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "本月" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "今年" @@ -96,7 +100,7 @@ msgstr "Query参数" msgid "Is Shared" msgstr "是否共享" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "书签" @@ -140,41 +144,37 @@ msgstr "用户小组件" msgid "User Widgets" msgstr "用户小组件" -#: widgets.py:48 -msgid "Now" -msgstr "现在" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "删除所选的 %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "成功删除了 %(count)d 个 %(items)s" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "无法删除 %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "你确定吗？" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "选中了 %(total_count)s 个" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s 个中 0 个被选" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "条目必须选中以对其进行操作。没有任何条目被更改。" @@ -199,22 +199,28 @@ msgid "Count" msgstr "总数" #: plugins/auth.py:21 +#, python-format msgid "Can add %s" msgstr "可查看%s" #: plugins/auth.py:22 +#, python-format msgid "Can change %s" msgstr "修改%s" #: plugins/auth.py:23 +#, python-format msgid "Can edit %s" msgstr "可查看%s" #: plugins/auth.py:24 +#, python-format +#| msgid "Can delete %s" msgid "Can delete %s" -msgstr "无法删除%(name)s" +msgstr "可以删除%s" #: plugins/auth.py:25 +#, python-format msgid "Can view %s" msgstr "可查看%s" @@ -238,20 +244,20 @@ msgstr "状态" msgid "Permission Name" msgstr "权限" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "更改密码" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "更改密码：%s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "密码更改成功" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -266,12 +272,12 @@ msgstr "修改该字段" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "批量修改选择的%(verbose_name_plural)s" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "成功修改了 %(count)d 个 %(items)s" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "批量修改 %s" @@ -280,7 +286,7 @@ msgstr "批量修改 %s" msgid "bookmark" msgstr "书签" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "书签组件，展示用户书签页内容。" @@ -288,7 +294,7 @@ msgstr "书签组件，展示用户书签页内容。" msgid "Show models simple chart." msgstr "展示简单数据图表" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "%s图表" @@ -335,22 +341,22 @@ msgstr[0] "" msgid "Details of %s" msgstr "%s详情" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "输入%s" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "表" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "过滤器错误: %s" @@ -387,7 +393,7 @@ msgstr "图标" msgid "Forgotten your password or username?" msgstr "忘记了您的密码或用户名？" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "创建新的 %s" @@ -396,7 +402,7 @@ msgstr "创建新的 %s" msgid "Related Objects" msgstr "关联数据" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "搜索%s" @@ -417,8 +423,8 @@ msgstr "Bootstrap2" msgid "Bootstrap 2.x theme" msgstr "Bootstrap2主题" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "增加 %s" @@ -506,9 +512,10 @@ msgstr "页面没有找到" msgid "We're sorry, but the requested page could not be found." msgstr "很报歉，请求页面无法找到。" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -519,7 +526,7 @@ msgstr "很报歉，请求页面无法找到。" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "首页" @@ -539,18 +546,6 @@ msgstr "服务器错误 (500)" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "发生了一个错误。系统已将错误通过电子邮件报告给了站点管理员，相信问题应该会很快得到解决。感谢您的耐心。" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "欢迎，" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "注销" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "你无权修改任何东西。" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -651,11 +646,24 @@ msgstr "输入你的新密码" msgid "Enter a new password for the user %(username)s." msgstr "为用户 %(username)s 输入一个新的密码。" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "欢迎，" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "注销" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "你无权修改任何东西。" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "主题" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -681,7 +689,7 @@ msgstr "下一步" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "保存" @@ -741,26 +749,27 @@ msgstr "图表" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "导出" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "导出表头" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "导出格式" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "导出全部数据" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "关闭" @@ -870,7 +879,7 @@ msgid "Choose" msgstr "选择" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "删除" @@ -892,7 +901,7 @@ msgstr "显示全部" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "保存中.." @@ -1130,18 +1139,22 @@ msgstr "添加成功，点击 编辑 可以继续修改 msgid "Quick Add" msgstr "快速添加" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "小组件设置项" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "保存变更" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "我的公司" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "小组件ID" @@ -1150,39 +1163,39 @@ msgstr "小组件ID" msgid "Widget Title" msgstr "小组件标题" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "HTML内容小组件，可以编写任意HTML内容。" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "HTML内容" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "目标数据" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "快捷按钮小组件，可以快速打开任意页面。" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "快速按钮" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "数据列表小组件" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "添加任意数据的小组件" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "仪表盘" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "%s 主页" @@ -1192,7 +1205,7 @@ msgstr "%s 主页" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "其它字段" @@ -1201,33 +1214,34 @@ msgstr "其它字段" msgid "%s Detail" msgstr "%s详情" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 添加成功。" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "你可以在下面再次编辑它。" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "你可以在下面增加另一个 %s 。" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "修改 %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" #: views/form.py:164 +#, python-format msgid "The %s was changed successfully." -msgstr "%(name)s \"%(obj)s\" 修改成功。" +msgstr "%s 修改成功。" #: views/list.py:198 msgid "Database error" @@ -1253,3 +1267,7 @@ msgstr "取消排序" #: views/website.py:16 msgid "Main Dashboard" msgstr "主页面" + +#: widgets.py:48 +msgid "Now" +msgstr "现在" diff --git a/xadmin/templates/xadmin/blocks/model_list.nav_form.search_form.html b/xadmin/templates/xadmin/blocks/model_list.nav_form.search_form.html index 222e74aed..01fd9724d 100644 --- a/xadmin/templates/xadmin/blocks/model_list.nav_form.search_form.html +++ b/xadmin/templates/xadmin/blocks/model_list.nav_form.search_form.html @@ -5,7 +5,7 @@ {% if cl.search_query %} x {% endif %} - +

    {{ search_form_params|safe }} From 86e164824f360c586ae74fae4205b5515d65202e Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Fri, 22 May 2015 16:03:29 +0800 Subject: [PATCH 025/180] Fix js files some translate keyword --- xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 19551 -> 19551 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 3 +- xadmin/locale/zh_CN/LC_MESSAGES/djangojs.mo | Bin 1433 -> 1583 bytes xadmin/locale/zh_CN/LC_MESSAGES/djangojs.po | 30 ++++++++++++++---- .../static/xadmin/js/xadmin.page.dashboard.js | 4 +-- .../static/xadmin/js/xadmin.plugin.details.js | 4 +-- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index f4f7980a11e13254a8df87baa19821b5f2dfdc55..21ed5b16ad0dfde7303c7994e59a14d3b02389de 100644 GIT binary patch delta 17 YcmcaVgYo_h#tq>{Or|EABaPUk06}*J^8f$< delta 17 YcmcaVgYo_h#tq>{Ova|0BaPUk06}jB@&Et; diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.po b/xadmin/locale/zh_CN/LC_MESSAGES/django.po index 49059dd86..a9bdeafe4 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-22 15:35+0800\n" +"POT-Creation-Date: 2015-05-22 15:54+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xadmin/language/zh_CN/)\n" @@ -215,7 +215,6 @@ msgstr "可查看%s" #: plugins/auth.py:24 #, python-format -#| msgid "Can delete %s" msgid "Can delete %s" msgstr "可以删除%s" diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.mo b/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.mo index 9612a41eb692b0eff9a3d44510e00cc37210e9b9..4879d7a9f3603f3402d974859c333a6fc0f72624 100644 GIT binary patch delta 519 zcmX}o%S!@590%}OckQ)4B7&fzl#qguOt3(R2=UhA5J3?XOD-x%9W1FJJb9=~$n-|3 z{s0R}uonu^#ZwVMr@Ew;H?Q6L{%q+7zxn)ThWX9x9?O@8=tqmR&k)VXPGkbvMzw$e zu?~mf2Gqec)WZxE;jK2$K?(CmH~cd$GQa?kHIr8es<3!3WKP<};ke`Wu{s{b`td;aLDa&@+V!^JdVvZ#jm<8n}J2o zB#(*nyeclVma})IoikR7T~!WK?CbvEI~V8Y(gZ(|LWW{KSxOxh^B3j48*bHi@g9BT E7vLIIMF0Q* delta 358 zcmXZXO-lk%6vpv8Iy1f#2GYWysTLw4sUrkJC5St56E2iMEPMm0)odbg)6PwFXb}iP zU!Y~5!CfCfTDNWAqW`^i;F;eY4rlI}_vCA0{+lMQG)s(gMB%{!0$}g6x sMZe@#{93szjqr!W?cPpna61kL<6+IapY$7Txv~3Fa9VQg%w*}vA8vsshX4Qo diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.po b/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.po index 0fc75bc68..7d874aea6 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -1,28 +1,46 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # sshwsfc , 2013 msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-30 23:11+0800\n" +"POT-Creation-Date: 2015-05-22 16:02+0800\n" "PO-Revision-Date: 2013-11-20 12:41+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xadmin/language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/xadmin/js/xadmin.plugin.actions.js:20 +#: static/xadmin/js/xadmin.page.dashboard.js:14 +#: static/xadmin/js/xadmin.plugin.details.js:24 +#: static/xadmin/js/xadmin.plugin.quick-form.js:172 +msgid "Close" +msgstr "关闭" + +#: static/xadmin/js/xadmin.page.dashboard.js:15 +msgid "Save changes" +msgstr "保存修改" + +#: static/xadmin/js/xadmin.plugin.actions.js:11 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "选中了 %(cnt)s 个中的 %(sel)s 个" +#: static/xadmin/js/xadmin.plugin.details.js:25 +msgid "Edit" +msgstr "编辑" + +#: static/xadmin/js/xadmin.plugin.quick-form.js:173 +msgid "Add" +msgstr "添加" + #: static/xadmin/js/xadmin.plugin.revision.js:25 msgid "New Item" msgstr "新项目" @@ -40,9 +58,7 @@ msgid "Su Mo Tu We Th Fr Sa Su" msgstr "日 一 二 三 四 五 六" #: static/xadmin/js/xadmin.widget.datetime.js:35 -msgid "" -"January February March April May June July August September October November" -" December" +msgid "January February March April May June July August September October November December" msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月" #: static/xadmin/js/xadmin.widget.datetime.js:36 diff --git a/xadmin/static/xadmin/js/xadmin.page.dashboard.js b/xadmin/static/xadmin/js/xadmin.page.dashboard.js index c901c9d0c..520fe5d54 100644 --- a/xadmin/static/xadmin/js/xadmin.page.dashboard.js +++ b/xadmin/static/xadmin/js/xadmin.page.dashboard.js @@ -11,8 +11,8 @@ jQuery(function() { if(!btn.data('form-modal')){ var modal = $(''); + '
    '+ + ''+gettext('Save changes')+'
    '); $('body').append(modal); btn.data('form-modal', modal); modal.find('.modal-body').load(form_url, function(form_html, status, xhr){ diff --git a/xadmin/static/xadmin/js/xadmin.plugin.details.js b/xadmin/static/xadmin/js/xadmin.plugin.details.js index 9bfa75dbf..bc58a9434 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.details.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.details.js @@ -21,8 +21,8 @@ modal = $(''); + '
    '+ + ' '+gettext('Edit')+'
    • '); $('body').append(modal); } modal.find('.modal-title').html(el.attr('title')); From bced97554c03929e6ea74812837cfe3e37ca2648 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Mon, 25 May 2015 12:15:41 +0800 Subject: [PATCH 026/180] Add select2 widget language support --- xadmin/templates/xadmin/base.html | 1 + xadmin/widgets.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xadmin/templates/xadmin/base.html b/xadmin/templates/xadmin/base.html index 003503057..09488dc57 100644 --- a/xadmin/templates/xadmin/base.html +++ b/xadmin/templates/xadmin/base.html @@ -23,6 +23,7 @@ {% block extrahead %}{% endblock %} diff --git a/xadmin/widgets.py b/xadmin/widgets.py index c860c7c25..cca441684 100644 --- a/xadmin/widgets.py +++ b/xadmin/widgets.py @@ -8,8 +8,9 @@ from django.utils.safestring import mark_safe from django.utils.html import conditional_escape from django.utils.translation import ugettext as _ +from django.forms import Media -from util import vendor +from util import vendor, static, get_language class AdminDateWidget(forms.DateInput): @@ -52,7 +53,8 @@ class AdminSelectWidget(forms.Select): @property def media(self): - return vendor('select.js', 'select.css', 'xadmin.widget.select.js') + return vendor('select.js', 'select.css', 'xadmin.widget.select.js') + \ + Media(js=[static('xadmin/vendor/select2/select2_locale_%s.js' % get_language())]) class AdminSplitDateTime(forms.SplitDateTimeWidget): From db1327d2590f25d51a76aa72ad101c3a9d27af93 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Mon, 25 May 2015 15:25:23 +0800 Subject: [PATCH 027/180] Fix select2 locale for zh_CN --- xadmin/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/widgets.py b/xadmin/widgets.py index cca441684..5fb06b09c 100644 --- a/xadmin/widgets.py +++ b/xadmin/widgets.py @@ -54,7 +54,7 @@ class AdminSelectWidget(forms.Select): @property def media(self): return vendor('select.js', 'select.css', 'xadmin.widget.select.js') + \ - Media(js=[static('xadmin/vendor/select2/select2_locale_%s.js' % get_language())]) + Media(js=[static('xadmin/vendor/select2/select2_locale_%s.js' % get_language().replace('_','-'))]) class AdminSplitDateTime(forms.SplitDateTimeWidget): From 8c5f6c466fc1709b99f74a3e03911438c8e509de Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Mon, 25 May 2015 15:52:55 +0800 Subject: [PATCH 028/180] Fix select2 widget locale --- xadmin/util.py | 2 +- xadmin/vendors.py | 4 ++-- xadmin/widgets.py | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xadmin/util.py b/xadmin/util.py index 879ccd194..38e308728 100644 --- a/xadmin/util.py +++ b/xadmin/util.py @@ -77,7 +77,7 @@ def xstatic(*tags): files = node[mode] files = type(files) in (list, tuple) and files or [files, ] - fs.extend(files) + fs.extend([f % {'lang': lang.replace('_', '-')} for f in files]) return [f.startswith('http://') and f or static(f) for f in fs] diff --git a/xadmin/vendors.py b/xadmin/vendors.py index 8eb947e2f..3ce79d642 100644 --- a/xadmin/vendors.py +++ b/xadmin/vendors.py @@ -81,8 +81,8 @@ 'dev': ['xadmin/vendor/select2/select2.css', 'xadmin/vendor/selectize/selectize.css', 'xadmin/vendor/selectize/selectize.bootstrap3.css'], }, "js": { - 'dev': ['xadmin/vendor/selectize/selectize.js', 'xadmin/vendor/select2/select2.js'], - 'production': ['xadmin/vendor/selectize/selectize.min.js', 'xadmin/vendor/select2/select2.min.js'] + 'dev': ['xadmin/vendor/selectize/selectize.js', 'xadmin/vendor/select2/select2.js', 'xadmin/vendor/select2/select2_locale_%(lang)s.js'], + 'production': ['xadmin/vendor/selectize/selectize.min.js', 'xadmin/vendor/select2/select2.min.js', 'xadmin/vendor/select2/select2_locale_%(lang)s.js'] } }, "multiselect": { diff --git a/xadmin/widgets.py b/xadmin/widgets.py index 5fb06b09c..c860c7c25 100644 --- a/xadmin/widgets.py +++ b/xadmin/widgets.py @@ -8,9 +8,8 @@ from django.utils.safestring import mark_safe from django.utils.html import conditional_escape from django.utils.translation import ugettext as _ -from django.forms import Media -from util import vendor, static, get_language +from util import vendor class AdminDateWidget(forms.DateInput): @@ -53,8 +52,7 @@ class AdminSelectWidget(forms.Select): @property def media(self): - return vendor('select.js', 'select.css', 'xadmin.widget.select.js') + \ - Media(js=[static('xadmin/vendor/select2/select2_locale_%s.js' % get_language().replace('_','-'))]) + return vendor('select.js', 'select.css', 'xadmin.widget.select.js') class AdminSplitDateTime(forms.SplitDateTimeWidget): From 1e132e437b6cfe4d25b0d9eba8d38badca72a35f Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Mon, 25 May 2015 17:46:11 +0800 Subject: [PATCH 029/180] Fix datepicker widget icon. --- .../vendor/bootstrap-datepicker/js/bootstrap-datepicker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xadmin/static/xadmin/vendor/bootstrap-datepicker/js/bootstrap-datepicker.js b/xadmin/static/xadmin/vendor/bootstrap-datepicker/js/bootstrap-datepicker.js index 1653b5518..da25ad2d4 100644 --- a/xadmin/static/xadmin/vendor/bootstrap-datepicker/js/bootstrap-datepicker.js +++ b/xadmin/static/xadmin/vendor/bootstrap-datepicker/js/bootstrap-datepicker.js @@ -65,7 +65,7 @@ if (this.isRTL){ this.picker.addClass('datepicker-rtl'); this.picker.find('.prev i, .next i') - .toggleClass('icon-arrow-left icon-arrow-right'); + .toggleClass('fa fa-arrow-left fa-arrow-right'); } this.autoclose = false; @@ -1010,9 +1010,9 @@ }, headTemplate: ''+ ''+ - ''+ + ''+ ''+ - ''+ + ''+ ''+ '', contTemplate: '', From ef5e3c7f0f1e335ef151276a3719903864c66801 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 17 Jun 2015 11:23:58 +0800 Subject: [PATCH 030/180] Add min-height style to content div. --- xadmin/static/xadmin/css/xadmin.responsive.css | 1 + 1 file changed, 1 insertion(+) diff --git a/xadmin/static/xadmin/css/xadmin.responsive.css b/xadmin/static/xadmin/css/xadmin.responsive.css index d6e53153f..6fad0a94d 100644 --- a/xadmin/static/xadmin/css/xadmin.responsive.css +++ b/xadmin/static/xadmin/css/xadmin.responsive.css @@ -28,6 +28,7 @@ @media (min-width: 768px) { #content-block:not(.full-content) { padding-left: 5px; + min-height: 450px; } .form-actions .more-btns{ display: inline-block !important; From aeba185943143a8034bb8ac2b25a1a19e5946da2 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 17 Jun 2015 11:25:22 +0800 Subject: [PATCH 031/180] If user did't has change object permission, don't display edit button is popup object detail page. --- xadmin/static/xadmin/js/xadmin.plugin.details.js | 7 ++++++- xadmin/static/xadmin/js/xadmin.plugin.editable.js | 4 ++-- xadmin/views/list.py | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xadmin/static/xadmin/js/xadmin.plugin.details.js b/xadmin/static/xadmin/js/xadmin.plugin.details.js index bc58a9434..12b4a0b8a 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.details.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.details.js @@ -26,7 +26,12 @@ $('body').append(modal); } modal.find('.modal-title').html(el.attr('title')); - modal.find('.edit-btn').attr('href', this.edit_uri); + var edit_btn = modal.find('.edit-btn'); + if(this.edit_uri != ""){ + edit_btn.attr('href', this.edit_uri); + }else{ + edit_btn.remove(); + } modal.find('.modal-body').html('

    '); modal.find('.modal-body').load(this.res_uri + '?_format=html', function(response, status, xhr) { if (status == "error") { diff --git a/xadmin/static/xadmin/js/xadmin.plugin.editable.js b/xadmin/static/xadmin/js/xadmin.plugin.editable.js index 31cb89f31..881edf5b3 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.editable.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.editable.js @@ -67,11 +67,11 @@ if(this.content == null){ var that = this - $el.find('>i').removeClass('fa fa-edit').addClass('fa-spinner fa-spin') + $el.find('>i').removeClass('fa fa-edit').addClass('fa fa-spinner fa-spin') $.ajax({ url: $el.data('editable-loadurl'), success: function(content){ - $el.find('>i').removeClass('fa-spinner fa-spin').addClass('fa fa-edit') + $el.find('>i').removeClass('fa fa-spinner fa-spin').addClass('fa fa-edit') that.content = content that.toggle() }, diff --git a/xadmin/views/list.py b/xadmin/views/list.py index 7cd62b03e..c05e6f9bb 100644 --- a/xadmin/views/list.py +++ b/xadmin/views/list.py @@ -571,7 +571,10 @@ def result_item(self, obj, field_name, row): if self.list_display_links_details: item_res_uri = self.model_admin_url("https://github.com/detail%22,%20getattr(obj,%20self.pk_attname)) if item_res_uri: - edit_url = self.model_admin_url("https://github.com/change%22,%20getattr(obj,%20self.pk_attname)) + if self.has_change_permission(obj): + edit_url = self.model_admin_url("https://github.com/change%22,%20getattr(obj,%20self.pk_attname)) + else: + edit_url = "" item.wraps.append('%%s' % (item_res_uri, edit_url, _(u'Details of %s') % str(obj))) else: From d2995e4ae7565e6bd70fc2f306d3723aa26a10d6 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sun, 21 Jun 2015 21:50:56 +0800 Subject: [PATCH 032/180] Fixed editable plugin popover hide bug. --- xadmin/static/xadmin/js/xadmin.plugin.editable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/static/xadmin/js/xadmin.plugin.editable.js b/xadmin/static/xadmin/js/xadmin.plugin.editable.js index 881edf5b3..efc72eea3 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.editable.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.editable.js @@ -139,7 +139,7 @@ this.$form.find('.controls').append(err_html.join('\n')) } else { this.$text.html(data['new_html'][this.field]) - this.hide() + this.leave(this) } }, this)) .fail($.proxy(function(xhr) { From f0f5a2db10ded50751ce808d74b853ab440114cf Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Mon, 29 Jun 2015 23:19:02 +0800 Subject: [PATCH 033/180] Fix auth permission models words translate. --- xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 19551 -> 19541 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index 21ed5b16ad0dfde7303c7994e59a14d3b02389de..bf053f42f1f17d206b8d7231021aa5181e19daa8 100644 GIT binary patch delta 2016 zcmXZceQ1?s7{~Ej1&`Cs>Bw0&!^P1ZjGUUCvu2uh*0gEn%Mi>)1tKDmokVj?d6qad zmy$Si^L2(pm>7ncrcM8ejNbk!K~WU6O{4H7Fj92%{q_9*`rOxb-}iN2&;2~-Ty5=h zzO~QMpYo!-5JGP{1UVoRTVzY@80^pdc+AHP4#O(Xzkx->OFaLf;|+GF?ZjtU*M+L{ zXC_2pD1(1V6ym^&cwz)5h|5q1mph+!oW+;P*Eqig^#Hp(f6)2EsJbUn4Sw(ZC47$f zW%&!dL37mvWaSm?4n#{ z97oF;sNVjRT24!{_k`>cH!$2JbiyFNH9ZxB#_(;s5gf z>lkRm5>MnDuR%4?gu0=RJ-^-VLS69z)c!8ix*zOssQp(we+_l;ZRh_{J|gkJ6Nzc@ zl?_HMEOneh9WdGPOuHEMtq5_0>0_4%%k-A>VH}jB2PG^)3B{!|@(!eL*&!ACcw#D^W^9 z3&x@1YShQG0QC-+q6)6YVqAwR+~WDYs0NRq_Mbql|JL!3_&D(e)X(lNs&1l+``3oy zRUtfuNz{{NQ3YN{9kdX&?k${%@1oZ4M-@7QkKr$`8kT^}q0)z2$syb-ZsR>fj{m)lEP(xD5Hc!bW=zpC(Ssh>ga2@EYm~ z-bY=16TXeD*dOnsJ|cZNZBT;Be}(g~%W>hWalY7&MBPBramtoso__ynC#IpEV1}(l zUF|zIhk3*wVFH`&cIS6v8Tk%egFic8T@%03xu^$w6LroCEad#K)`?G0ownJ%s0{~D zSNSET@K;RYL#)NpSs_ft)u^jJj$`p2>V`(mj_a18;%6LB#QYKxX-{NrjTg*2wrFU_ z=<=Qur@J?|SB_p8en0zpPs`UDb#H3_qwSzZH@?|%^UOAldiHnR*wb8jER#tM`wy;V B?WO<# delta 2026 zcmX}tduYvJ9LMp8X*Y8@m`x-!rY)x&mt8Oib2quH+_iE`3b}qw(Vj_**^ zhO<$H%tI}_%<}8ZV${N=sGB-~F?bR+{;c)apw_vKE$|^~{gZM-|v;en;Iv(jfmNolqNvP$vwd#*aj;Gu>QZ{VR}tJr|)divcB=hOcow z#^?E0x&>8WsksNWL8TeRMB?+<53is${D>;>hsBA5of}1*f|_6SPoDn*8k(@!IwBTt zLOs(mQ~|rK|FBtwy5e)F`SqxAkIfgT`R}a%18U>%mUm(1c_fx|N0(_Y3Osfj9sw-`AKkbd}BOj zmxo#?VwRxZ`ZCl;2hG#Sd+cga1${!jOJ6Ys|DeXF@It9SZ5YpAiA)k2kd2Bbpl)Io z>KQIYP1u0#aVu)!O6xy`D)0(w{!P^Q`xZaJRN_~t&+aE`-9SF~uL)iAo$HK2)X54^ z3rs_8RD>G05JR{MHU120p*z?PpP|NmL>2S{W3bt9KOc`OBpKBo^k_tAWTQ5$F|V1o z%)6-Hg$L$0%Xb;!&r3&b97H|30jL6(A@7^pWj@4i#DS5%USDfWL7iYN>gvm|2#;ed z#_-1IB}&8!?19SPz=>FIafi`8OLvNA0r)Td}{}Vu^jIN>7-lP!rCfuJSte#OIiX zv19oI!c5G=4XCTG!wmd`x}l75{<^(UaX*U(Vp1m(Ve2R`3vIxR>S=*!_nd~Zi;YL3 oZx3znzTCa3yU@7jDh-lvu0<%j>r{2yQ4E30SnU#T$lRR910 diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.po b/xadmin/locale/zh_CN/LC_MESSAGES/django.po index a9bdeafe4..22de0274e 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/django.po @@ -201,27 +201,27 @@ msgstr "总数" #: plugins/auth.py:21 #, python-format msgid "Can add %s" -msgstr "可查看%s" +msgstr "添加:%s" #: plugins/auth.py:22 #, python-format msgid "Can change %s" -msgstr "修改%s" +msgstr "修改:%s" #: plugins/auth.py:23 #, python-format msgid "Can edit %s" -msgstr "可查看%s" +msgstr "编辑:%s" #: plugins/auth.py:24 #, python-format msgid "Can delete %s" -msgstr "可以删除%s" +msgstr "删除:%s" #: plugins/auth.py:25 #, python-format msgid "Can view %s" -msgstr "可查看%s" +msgstr "查看:%s" #: plugins/auth.py:87 msgid "Personal info" From 9affafad3201edc839d9bbd71e07fe8391dc5bc5 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 19 Nov 2015 10:39:32 +0800 Subject: [PATCH 034/180] Update requirement packages version --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6e311f1b4..b01d52b17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -django>=1.7 -django-crispy-forms>=1.4.0 -django-reversion>=1.8.3 \ No newline at end of file +django~=1.7 +django-crispy-forms~=1.4 +django-reversion~=1.8 From 278af43f260b7ab83656d59d91eb184716b2cdce Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 19 Nov 2015 19:13:23 +0800 Subject: [PATCH 035/180] Update requirements.txt --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b01d52b17..d6c24a534 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -django~=1.7 -django-crispy-forms~=1.4 -django-reversion~=1.8 +django~=1.7.0 +django-crispy-forms~=1.4.0 +django-reversion~=1.8.0 From 638bf9c9ceefd6c60384be953310e49431442d8d Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Mon, 1 Feb 2016 19:39:18 -0200 Subject: [PATCH 036/180] Fix for when the 'source attr' attribute is an unknown attribute. --- xadmin/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/util.py b/xadmin/util.py index 38e308728..b84480a62 100644 --- a/xadmin/util.py +++ b/xadmin/util.py @@ -233,7 +233,7 @@ def add_edge(self, source, target): def collect(self, objs, source_attr=None, **kwargs): for obj in objs: - if source_attr: + if source_attr and hasattr(obj, source_attr): self.add_edge(getattr(obj, source_attr), obj) else: self.add_edge(None, obj) From a7d797befbd7005170426028ba10429cfd0e142d Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 3 Feb 2016 09:49:24 +0800 Subject: [PATCH 037/180] Fixed error when get bootswatch API. --- xadmin/plugins/themes.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xadmin/plugins/themes.py b/xadmin/plugins/themes.py index cc202e252..19f577a4c 100644 --- a/xadmin/plugins/themes.py +++ b/xadmin/plugins/themes.py @@ -1,5 +1,5 @@ #coding:utf-8 -import urllib +import urllib, httplib2 from django.template import loader from django.core.cache import cache from django.utils.translation import ugettext as _ @@ -60,14 +60,16 @@ def block_top_navmenu(self, context, nodes): else: ex_themes = [] try: - watch_themes = json.loads(urllib.urlopen( - 'http://api.bootswatch.com/3/').read())['themes'] + h = httplib2.Http(".cache", disable_ssl_certificate_validation=True) + resp, content = h.request("http://bootswatch.com/api/3.json", 'GET', \ + "", headers={"Accept": "application/json", "User-Agent": self.request.META['HTTP_USER_AGENT']}) + watch_themes = json.loads(content)['themes'] ex_themes.extend([ {'name': t['name'], 'description': t['description'], 'css': t['cssMin'], 'thumbnail': t['thumbnail']} for t in watch_themes]) - except Exception: - pass + except Exception, e: + print e cache.set(THEME_CACHE_KEY, json.dumps(ex_themes), 24 * 3600) themes.extend(ex_themes) From 50e736c1a2d754b747544807651bfe9b50807e5a Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Wed, 3 Feb 2016 09:49:47 +0800 Subject: [PATCH 038/180] Add language switch demo in demo app. --- demo_app/demo/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py index 678c1c369..431019ebc 100644 --- a/demo_app/demo/settings.py +++ b/demo_app/demo/settings.py @@ -45,7 +45,7 @@ LANGUAGES = ( ('en', gettext('English')), - ('zh_CN', gettext('Chinese')), + ('zh-cn', gettext('Chinese')), ) SITE_ID = 1 @@ -111,6 +111,7 @@ 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.locale.LocaleMiddleware', # Uncomment the next line for simple clickjacking protection: # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) From f4eee00cb62d689c862adae2c260007b7a22d0e3 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sat, 27 Feb 2016 11:48:37 +0800 Subject: [PATCH 039/180] BootsWatch Api use http request. --- xadmin/plugins/themes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/plugins/themes.py b/xadmin/plugins/themes.py index 19f577a4c..534429f3a 100644 --- a/xadmin/plugins/themes.py +++ b/xadmin/plugins/themes.py @@ -60,7 +60,7 @@ def block_top_navmenu(self, context, nodes): else: ex_themes = [] try: - h = httplib2.Http(".cache", disable_ssl_certificate_validation=True) + h = httplib2.Http() resp, content = h.request("http://bootswatch.com/api/3.json", 'GET', \ "", headers={"Accept": "application/json", "User-Agent": self.request.META['HTTP_USER_AGENT']}) watch_themes = json.loads(content)['themes'] From 122fa6ece676dc0404f822465b9af2f6572d6bb2 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sat, 27 Feb 2016 11:48:56 +0800 Subject: [PATCH 040/180] Include page.form.js into detail model pages. --- xadmin/views/detail.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xadmin/views/detail.py b/xadmin/views/detail.py index 4db265638..36fc75032 100644 --- a/xadmin/views/detail.py +++ b/xadmin/views/detail.py @@ -256,10 +256,8 @@ def get_breadcrumb(self): @filter_hook def get_media(self): - media = super(DetailAdminView, self).get_media() - media = media + self.form_obj.media - media.add_css({'screen': [self.static('xadmin/css/xadmin.form.css')]}) - return media + return super(DetailAdminView, self).get_media() + self.form_obj.media + \ + self.vendor('xadmin.page.form.js', 'xadmin.form.css') @filter_hook def get_field_result(self, field_name): From a7f7ef469d34068d93da9b261b6236ad6c18258a Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sat, 27 Feb 2016 11:49:49 +0800 Subject: [PATCH 041/180] Upgrade selectize.js => 0.12.0 --- .../vendor/selectize/selectize.bootstrap2.css | 487 ++++++++++ .../vendor/selectize/selectize.bootstrap3.css | 301 +++---- .../xadmin/vendor/selectize/selectize.css | 225 ++--- .../vendor/selectize/selectize.default.css | 257 +++--- .../xadmin/vendor/selectize/selectize.js | 839 ++++++++++++------ .../vendor/selectize/selectize.legacy.css | 247 +++--- .../xadmin/vendor/selectize/selectize.min.js | 6 +- 7 files changed, 1497 insertions(+), 865 deletions(-) create mode 100644 xadmin/static/xadmin/vendor/selectize/selectize.bootstrap2.css diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap2.css b/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap2.css new file mode 100644 index 000000000..16b792cd7 --- /dev/null +++ b/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap2.css @@ -0,0 +1,487 @@ +/** + * selectize.bootstrap2.css (v0.12.1) - Bootstrap 2 Theme + * Copyright (c) 2013–2015 Brian Reavis & contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this + * file except in compliance with the License. You may obtain a copy of the License at: + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under + * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + * ANY KIND, either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + * + * @author Brian Reavis + */ +.selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder { + visibility: visible !important; + background: #f2f2f2 !important; + background: rgba(0, 0, 0, 0.06) !important; + border: 0 none !important; + -webkit-box-shadow: inset 0 0 12px 4px #ffffff; + box-shadow: inset 0 0 12px 4px #ffffff; +} +.selectize-control.plugin-drag_drop .ui-sortable-placeholder::after { + content: '!'; + visibility: hidden; +} +.selectize-control.plugin-drag_drop .ui-sortable-helper { + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); +} +.selectize-dropdown-header { + position: relative; + padding: 3px 10px; + border-bottom: 1px solid #d0d0d0; + background: #f8f8f8; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.selectize-dropdown-header-close { + position: absolute; + right: 10px; + top: 50%; + color: #333333; + opacity: 0.4; + margin-top: -12px; + line-height: 20px; + font-size: 20px !important; +} +.selectize-dropdown-header-close:hover { + color: #000000; +} +.selectize-dropdown.plugin-optgroup_columns .optgroup { + border-right: 1px solid #f2f2f2; + border-top: 0 none; + float: left; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.selectize-dropdown.plugin-optgroup_columns .optgroup:last-child { + border-right: 0 none; +} +.selectize-dropdown.plugin-optgroup_columns .optgroup:before { + display: none; +} +.selectize-dropdown.plugin-optgroup_columns .optgroup-header { + border-top: 0 none; +} +.selectize-control.plugin-remove_button [data-value] { + position: relative; + padding-right: 24px !important; +} +.selectize-control.plugin-remove_button [data-value] .remove { + z-index: 1; + /* fixes ie bug (see #392) */ + position: absolute; + top: 0; + right: 0; + bottom: 0; + width: 17px; + text-align: center; + font-weight: bold; + font-size: 12px; + color: inherit; + text-decoration: none; + vertical-align: middle; + display: inline-block; + padding: 1px 0 0 0; + border-left: 1px solid #cccccc; + -webkit-border-radius: 0 2px 2px 0; + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.selectize-control.plugin-remove_button [data-value] .remove:hover { + background: rgba(0, 0, 0, 0.05); +} +.selectize-control.plugin-remove_button [data-value].active .remove { + border-left-color: #0077b3; +} +.selectize-control.plugin-remove_button .disabled [data-value] .remove:hover { + background: none; +} +.selectize-control.plugin-remove_button .disabled [data-value] .remove { + border-left-color: #e0e0e0; +} +.selectize-control { + position: relative; +} +.selectize-dropdown, +.selectize-input, +.selectize-input input { + color: #333333; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 20px; + -webkit-font-smoothing: inherit; +} +.selectize-input, +.selectize-control.single .selectize-input.input-active { + background: #ffffff; + cursor: text; + display: inline-block; +} +.selectize-input { + border: 1px solid #d0d0d0; + padding: 7px 10px; + display: inline-block; + width: 100%; + overflow: hidden; + position: relative; + z-index: 1; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.selectize-control.multi .selectize-input.has-items { + padding: 5px 10px 2px; +} +.selectize-input.full { + background-color: #ffffff; +} +.selectize-input.disabled, +.selectize-input.disabled * { + cursor: default !important; +} +.selectize-input.focus { + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); +} +.selectize-input.dropdown-active { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.selectize-input > * { + vertical-align: baseline; + display: -moz-inline-stack; + display: inline-block; + zoom: 1; + *display: inline; +} +.selectize-control.multi .selectize-input > div { + cursor: pointer; + margin: 0 3px 3px 0; + padding: 1px 3px; + background: #e6e6e6; + color: #333333; + border: 1px solid #cccccc; +} +.selectize-control.multi .selectize-input > div.active { + background: #0088cc; + color: #ffffff; + border: 1px solid #0077b3; +} +.selectize-control.multi .selectize-input.disabled > div, +.selectize-control.multi .selectize-input.disabled > div.active { + color: #474747; + background: #fafafa; + border: 1px solid #e0e0e0; +} +.selectize-input > input { + display: inline-block !important; + padding: 0 !important; + min-height: 0 !important; + max-height: none !important; + max-width: 100% !important; + margin: 0 !important; + text-indent: 0 !important; + border: 0 none !important; + background: none !important; + line-height: inherit !important; + -webkit-user-select: auto !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} +.selectize-input > input::-ms-clear { + display: none; +} +.selectize-input > input:focus { + outline: none !important; +} +.selectize-input::after { + content: ' '; + display: block; + clear: left; +} +.selectize-input.dropdown-active::before { + content: ' '; + display: block; + position: absolute; + background: #e5e5e5; + height: 1px; + bottom: 0; + left: 0; + right: 0; +} +.selectize-dropdown { + position: absolute; + z-index: 10; + border: 1px solid #cccccc; + background: #ffffff; + margin: -1px 0 0 0; + border-top: 0 none; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.selectize-dropdown [data-selectable] { + cursor: pointer; + overflow: hidden; +} +.selectize-dropdown [data-selectable] .highlight { + background: rgba(255, 237, 40, 0.4); + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; +} +.selectize-dropdown [data-selectable], +.selectize-dropdown .optgroup-header { + padding: 3px 10px; +} +.selectize-dropdown .optgroup:first-child .optgroup-header { + border-top: 0 none; +} +.selectize-dropdown .optgroup-header { + color: #999999; + background: #ffffff; + cursor: default; +} +.selectize-dropdown .active { + background-color: #0088cc; + color: #ffffff; +} +.selectize-dropdown .active.create { + color: #ffffff; +} +.selectize-dropdown .create { + color: rgba(51, 51, 51, 0.5); +} +.selectize-dropdown-content { + overflow-y: auto; + overflow-x: hidden; + max-height: 200px; +} +.selectize-control.single .selectize-input, +.selectize-control.single .selectize-input input { + cursor: pointer; +} +.selectize-control.single .selectize-input.input-active, +.selectize-control.single .selectize-input.input-active input { + cursor: text; +} +.selectize-control.single .selectize-input:after { + content: ' '; + display: block; + position: absolute; + top: 50%; + right: 15px; + margin-top: -3px; + width: 0; + height: 0; + border-style: solid; + border-width: 5px 5px 0 5px; + border-color: #000000 transparent transparent transparent; +} +.selectize-control.single .selectize-input.dropdown-active:after { + margin-top: -4px; + border-width: 0 5px 5px 5px; + border-color: transparent transparent #000000 transparent; +} +.selectize-control.rtl.single .selectize-input:after { + left: 15px; + right: auto; +} +.selectize-control.rtl .selectize-input > input { + margin: 0 4px 0 -2px !important; +} +.selectize-control .selectize-input.disabled { + opacity: 0.5; + background-color: #ffffff; +} +.selectize-dropdown { + margin: 2px 0 0 0; + z-index: 1000; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 4px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); +} +.selectize-dropdown .optgroup-header { + font-size: 11px; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-transform: uppercase; +} +.selectize-dropdown .optgroup:first-child:before { + display: none; +} +.selectize-dropdown .optgroup:before { + content: ' '; + display: block; + *width: 100%; + height: 1px; + margin: 9px 1px; + *margin: -5px 0 5px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; + margin-left: -10px; + margin-right: -10px; +} +.selectize-dropdown [data-selectable].active { + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); +} +.selectize-dropdown-content { + padding: 5px 0; +} +.selectize-dropdown-header { + padding: 6px 10px; +} +.selectize-input { + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +.selectize-input.dropdown-active { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.selectize-input.dropdown-active::before { + display: none; +} +.selectize-input.input-active, +.selectize-input.input-active:hover, +.selectize-control.multi .selectize-input.focus { + background: #ffffff !important; + border-color: rgba(82, 168, 236, 0.8) !important; + outline: 0 !important; + outline: thin dotted \9 !important; + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6) !important; + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6) !important; + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6) !important; +} +.selectize-control.single .selectize-input { + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #e6e6e6; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); +} +.selectize-control.single .selectize-input:hover, +.selectize-control.single .selectize-input:focus, +.selectize-control.single .selectize-input:active, +.selectize-control.single .selectize-input.active, +.selectize-control.single .selectize-input.disabled, +.selectize-control.single .selectize-input[disabled] { + color: #333333; + background-color: #e6e6e6; + *background-color: #d9d9d9; +} +.selectize-control.single .selectize-input:active, +.selectize-control.single .selectize-input.active { + background-color: #cccccc \9; +} +.selectize-control.single .selectize-input:hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.selectize-control.single .selectize-input.disabled { + background: #e6e6e6 !important; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.selectize-control.multi .selectize-input { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.selectize-control.multi .selectize-input.has-items { + padding-left: 7px; + padding-right: 7px; +} +.selectize-control.multi .selectize-input > div { + color: #333333; + text-shadow: none; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #e6e6e6; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); +} +.selectize-control.multi .selectize-input > div.active { + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05); + box-shadow: 0 1px 2px rgba(0,0,0,.05); + color: #ffffff; + text-shadow: none; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); + border-color: #0077b3 #0077b3 #004466; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #0088cc; + border: 1px solid #0088cc; +} diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap3.css b/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap3.css index f385e3310..cfb2bfa2f 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap3.css +++ b/xadmin/static/xadmin/vendor/selectize/selectize.bootstrap3.css @@ -1,6 +1,6 @@ /** - * selectize.bootstrap3.css (v0.8.4) - Bootstrap 3 Theme - * Copyright (c) 2013 Brian Reavis & contributors + * selectize.bootstrap3.css (v0.12.1) - Bootstrap 3 Theme + * Copyright (c) 2013–2015 Brian Reavis & contributors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this * file except in compliance with the License. You may obtain a copy of the License at: @@ -13,436 +13,389 @@ * * @author Brian Reavis */ - .selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder { + visibility: visible !important; background: #f2f2f2 !important; background: rgba(0, 0, 0, 0.06) !important; border: 0 none !important; - visibility: visible !important; -webkit-box-shadow: inset 0 0 12px 4px #ffffff; - box-shadow: inset 0 0 12px 4px #ffffff; + box-shadow: inset 0 0 12px 4px #ffffff; } - .selectize-control.plugin-drag_drop .ui-sortable-placeholder::after { content: '!'; visibility: hidden; } - .selectize-control.plugin-drag_drop .ui-sortable-helper { -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); } - .selectize-dropdown-header { position: relative; padding: 3px 12px; - background: #f8f8f8; border-bottom: 1px solid #d0d0d0; + background: #f8f8f8; -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } - .selectize-dropdown-header-close { position: absolute; - top: 50%; right: 12px; - margin-top: -12px; - font-size: 20px !important; - line-height: 20px; + top: 50%; color: #333333; opacity: 0.4; + margin-top: -12px; + line-height: 20px; + font-size: 20px !important; } - .selectize-dropdown-header-close:hover { color: #000000; } - .selectize-dropdown.plugin-optgroup_columns .optgroup { - float: left; - border-top: 0 none; border-right: 1px solid #f2f2f2; + border-top: 0 none; + float: left; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:last-child { border-right: 0 none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:before { display: none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup-header { border-top: 0 none; } - .selectize-control.plugin-remove_button [data-value] { position: relative; padding-right: 24px !important; } - .selectize-control.plugin-remove_button [data-value] .remove { + z-index: 1; + /* fixes ie bug (see #392) */ position: absolute; top: 0; right: 0; bottom: 0; - display: inline-block; width: 17px; - padding: 1px 0 0 0; - font-size: 12px; + text-align: center; font-weight: bold; + font-size: 12px; color: inherit; - text-align: center; text-decoration: none; vertical-align: middle; + display: inline-block; + padding: 1px 0 0 0; border-left: 1px solid rgba(0, 0, 0, 0); -webkit-border-radius: 0 2px 2px 0; - -moz-border-radius: 0 2px 2px 0; - border-radius: 0 2px 2px 0; + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-control.plugin-remove_button [data-value] .remove:hover { background: rgba(0, 0, 0, 0.05); } - .selectize-control.plugin-remove_button [data-value].active .remove { border-left-color: rgba(0, 0, 0, 0); } - .selectize-control.plugin-remove_button .disabled [data-value] .remove:hover { background: none; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove { border-left-color: rgba(77, 77, 77, 0); } - .selectize-control { position: relative; } - .selectize-dropdown, .selectize-input, .selectize-input input { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - -webkit-font-smoothing: inherit; - line-height: 20px; color: #333333; + font-family: inherit; + font-size: inherit; + line-height: 20px; + -webkit-font-smoothing: inherit; } - .selectize-input, .selectize-control.single .selectize-input.input-active { - display: inline-block; - cursor: text; background: #ffffff; + cursor: text; + display: inline-block; } - .selectize-input { - position: relative; - z-index: 1; + border: 1px solid #cccccc; + padding: 6px 12px; display: inline-block; width: 100%; - padding: 6px 12px; overflow: hidden; - border: 1px solid #cccccc; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: none; - box-shadow: none; + position: relative; + z-index: 1; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: none; + box-shadow: none; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } - .selectize-control.multi .selectize-input.has-items { padding: 5px 12px 2px; } - .selectize-input.full { background-color: #ffffff; } - .selectize-input.disabled, .selectize-input.disabled * { cursor: default !important; } - .selectize-input.focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); } - .selectize-input.dropdown-active { -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } - .selectize-input > * { + vertical-align: baseline; display: -moz-inline-stack; display: inline-block; - *display: inline; - vertical-align: baseline; zoom: 1; + *display: inline; } - .selectize-control.multi .selectize-input > div { - padding: 1px 3px; - margin: 0 3px 3px 0; - color: #333333; cursor: pointer; + margin: 0 3px 3px 0; + padding: 1px 3px; background: #efefef; + color: #333333; border: 0 solid rgba(0, 0, 0, 0); } - .selectize-control.multi .selectize-input > div.active { - color: #ffffff; background: #428bca; + color: #ffffff; border: 0 solid rgba(0, 0, 0, 0); } - .selectize-control.multi .selectize-input.disabled > div, .selectize-control.multi .selectize-input.disabled > div.active { color: #808080; background: #ffffff; border: 0 solid rgba(77, 77, 77, 0); } - .selectize-input > input { - max-width: 100% !important; - max-height: none !important; - min-height: 0 !important; + display: inline-block !important; padding: 0 !important; + min-height: 0 !important; + max-height: none !important; + max-width: 100% !important; margin: 0 !important; - line-height: inherit !important; text-indent: 0 !important; - background: none !important; border: 0 none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + background: none !important; + line-height: inherit !important; -webkit-user-select: auto !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} +.selectize-input > input::-ms-clear { + display: none; } - .selectize-input > input:focus { outline: none !important; } - .selectize-input::after { + content: ' '; display: block; clear: left; - content: ' '; } - .selectize-input.dropdown-active::before { + content: ' '; + display: block; position: absolute; - right: 0; + background: #ffffff; + height: 1px; bottom: 0; left: 0; - display: block; - height: 1px; - background: #ffffff; - content: ' '; + right: 0; } - .selectize-dropdown { position: absolute; z-index: 10; - margin: -1px 0 0 0; + border: 1px solid #d0d0d0; background: #ffffff; - border: 1px solid #cccccc; + margin: -1px 0 0 0; border-top: 0 none; - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; } - .selectize-dropdown [data-selectable] { - overflow: hidden; cursor: pointer; + overflow: hidden; } - .selectize-dropdown [data-selectable] .highlight { background: rgba(255, 237, 40, 0.4); -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; } - .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header { padding: 3px 12px; } - .selectize-dropdown .optgroup:first-child .optgroup-header { border-top: 0 none; } - .selectize-dropdown .optgroup-header { - color: #999999; - cursor: default; + color: #777777; background: #ffffff; + cursor: default; } - .selectize-dropdown .active { - color: #ffffff; - background-color: #428bca; + background-color: #f5f5f5; + color: #262626; } - .selectize-dropdown .active.create { - color: #ffffff; + color: #262626; } - .selectize-dropdown .create { color: rgba(51, 51, 51, 0.5); } - .selectize-dropdown-content { - max-height: 200px; - overflow-x: hidden; overflow-y: auto; + overflow-x: hidden; + max-height: 200px; } - .selectize-control.single .selectize-input, .selectize-control.single .selectize-input input { cursor: pointer; } - .selectize-control.single .selectize-input.input-active, .selectize-control.single .selectize-input.input-active input { cursor: text; } - .selectize-control.single .selectize-input:after { + content: ' '; + display: block; position: absolute; top: 50%; right: 17px; - display: block; + margin-top: -3px; width: 0; height: 0; - margin-top: -3px; - border-color: #000000 transparent transparent transparent; border-style: solid; border-width: 5px 5px 0 5px; - content: ' '; + border-color: #333333 transparent transparent transparent; } - .selectize-control.single .selectize-input.dropdown-active:after { margin-top: -4px; - border-color: transparent transparent #000000 transparent; border-width: 0 5px 5px 5px; + border-color: transparent transparent #333333 transparent; } - .selectize-control.rtl.single .selectize-input:after { - right: auto; left: 17px; + right: auto; } - .selectize-control.rtl .selectize-input > input { margin: 0 4px 0 -2px !important; } - .selectize-control .selectize-input.disabled { - background-color: #ffffff; opacity: 0.5; + background-color: #ffffff; } - .selectize-dropdown, .selectize-dropdown.form-control { - z-index: 1000; height: auto; padding: 0; margin: 2px 0 0 0; + z-index: 1000; background: #ffffff; border: 1px solid #cccccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); } - .selectize-dropdown .optgroup-header { font-size: 12px; - line-height: 1.428571429; + line-height: 1.42857143; } - .selectize-dropdown .optgroup:first-child:before { display: none; } - .selectize-dropdown .optgroup:before { + content: ' '; display: block; height: 1px; margin: 9px 0; - margin-right: -12px; - margin-left: -12px; overflow: hidden; background-color: #e5e5e5; - content: ' '; + margin-left: -12px; + margin-right: -12px; } - .selectize-dropdown-content { padding: 5px 0; } - .selectize-dropdown-header { padding: 6px 12px; } - .selectize-input { min-height: 34px; } - .selectize-input.dropdown-active { -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } - .selectize-input.dropdown-active::before { display: none; } - .selectize-input.focus { border-color: #66afe9; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); +} +.has-error .selectize-input { + border-color: #a94442; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.has-error .selectize-input:focus { + border-color: #843534; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; } - .selectize-control.multi .selectize-input.has-items { - padding-right: 9px; padding-left: 9px; + padding-right: 9px; } - .selectize-control.multi .selectize-input > div { -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } - .form-control.selectize-control { - height: auto; padding: 0; - background: none; + height: auto; border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + background: none; -webkit-box-shadow: none; - box-shadow: none; -} \ No newline at end of file + box-shadow: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.css b/xadmin/static/xadmin/vendor/selectize/selectize.css index aab32d5e0..6c3ba0b24 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.css +++ b/xadmin/static/xadmin/vendor/selectize/selectize.css @@ -1,6 +1,6 @@ /** - * selectize.css (v0.8.4) - * Copyright (c) 2013 Brian Reavis & contributors + * selectize.css (v0.12.1) + * Copyright (c) 2013–2015 Brian Reavis & contributors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this * file except in compliance with the License. You may obtain a copy of the License at: @@ -15,346 +15,303 @@ */ .selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder { + visibility: visible !important; background: #f2f2f2 !important; background: rgba(0, 0, 0, 0.06) !important; border: 0 none !important; - visibility: visible !important; -webkit-box-shadow: inset 0 0 12px 4px #ffffff; - box-shadow: inset 0 0 12px 4px #ffffff; + box-shadow: inset 0 0 12px 4px #ffffff; } - .selectize-control.plugin-drag_drop .ui-sortable-placeholder::after { content: '!'; visibility: hidden; } - .selectize-control.plugin-drag_drop .ui-sortable-helper { -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); } - .selectize-dropdown-header { position: relative; padding: 5px 8px; - background: #f8f8f8; border-bottom: 1px solid #d0d0d0; + background: #f8f8f8; -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-dropdown-header-close { position: absolute; - top: 50%; right: 8px; - margin-top: -12px; - font-size: 20px !important; - line-height: 20px; + top: 50%; color: #303030; opacity: 0.4; + margin-top: -12px; + line-height: 20px; + font-size: 20px !important; } - .selectize-dropdown-header-close:hover { color: #000000; } - .selectize-dropdown.plugin-optgroup_columns .optgroup { - float: left; - border-top: 0 none; border-right: 1px solid #f2f2f2; + border-top: 0 none; + float: left; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:last-child { border-right: 0 none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:before { display: none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup-header { border-top: 0 none; } - .selectize-control.plugin-remove_button [data-value] { position: relative; padding-right: 24px !important; } - .selectize-control.plugin-remove_button [data-value] .remove { + z-index: 1; + /* fixes ie bug (see #392) */ position: absolute; top: 0; right: 0; bottom: 0; - display: inline-block; width: 17px; - padding: 2px 0 0 0; - font-size: 12px; + text-align: center; font-weight: bold; + font-size: 12px; color: inherit; - text-align: center; text-decoration: none; vertical-align: middle; + display: inline-block; + padding: 2px 0 0 0; border-left: 1px solid #d0d0d0; -webkit-border-radius: 0 2px 2px 0; - -moz-border-radius: 0 2px 2px 0; - border-radius: 0 2px 2px 0; + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-control.plugin-remove_button [data-value] .remove:hover { background: rgba(0, 0, 0, 0.05); } - .selectize-control.plugin-remove_button [data-value].active .remove { border-left-color: #cacaca; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove:hover { background: none; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove { border-left-color: #ffffff; } - .selectize-control { position: relative; } - .selectize-dropdown, .selectize-input, .selectize-input input { + color: #303030; font-family: inherit; font-size: 13px; - -webkit-font-smoothing: inherit; line-height: 18px; - color: #303030; + -webkit-font-smoothing: inherit; } - .selectize-input, .selectize-control.single .selectize-input.input-active { - display: inline-block; - cursor: text; background: #ffffff; + cursor: text; + display: inline-block; } - .selectize-input { - position: relative; - z-index: 1; + border: 1px solid #d0d0d0; + padding: 8px 8px; display: inline-block; width: 100%; - padding: 8px 8px; overflow: hidden; - border: 1px solid #d0d0d0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + position: relative; + z-index: 1; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } - .selectize-control.multi .selectize-input.has-items { padding: 6px 8px 3px; } - .selectize-input.full { background-color: #ffffff; } - .selectize-input.disabled, .selectize-input.disabled * { cursor: default !important; } - .selectize-input.focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); } - .selectize-input.dropdown-active { -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-input > * { + vertical-align: baseline; display: -moz-inline-stack; display: inline-block; - *display: inline; - vertical-align: baseline; zoom: 1; + *display: inline; } - .selectize-control.multi .selectize-input > div { - padding: 2px 6px; - margin: 0 3px 3px 0; - color: #303030; cursor: pointer; + margin: 0 3px 3px 0; + padding: 2px 6px; background: #f2f2f2; + color: #303030; border: 0 solid #d0d0d0; } - .selectize-control.multi .selectize-input > div.active { - color: #303030; background: #e8e8e8; + color: #303030; border: 0 solid #cacaca; } - .selectize-control.multi .selectize-input.disabled > div, .selectize-control.multi .selectize-input.disabled > div.active { color: #7d7d7d; background: #ffffff; border: 0 solid #ffffff; } - .selectize-input > input { - max-width: 100% !important; - max-height: none !important; - min-height: 0 !important; + display: inline-block !important; padding: 0 !important; + min-height: 0 !important; + max-height: none !important; + max-width: 100% !important; margin: 0 2px 0 0 !important; - line-height: inherit !important; text-indent: 0 !important; - background: none !important; border: 0 none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + background: none !important; + line-height: inherit !important; -webkit-user-select: auto !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} +.selectize-input > input::-ms-clear { + display: none; } - .selectize-input > input:focus { outline: none !important; } - .selectize-input::after { + content: ' '; display: block; clear: left; - content: ' '; } - .selectize-input.dropdown-active::before { + content: ' '; + display: block; position: absolute; - right: 0; + background: #f0f0f0; + height: 1px; bottom: 0; left: 0; - display: block; - height: 1px; - background: #f0f0f0; - content: ' '; + right: 0; } - .selectize-dropdown { position: absolute; z-index: 10; - margin: -1px 0 0 0; - background: #ffffff; border: 1px solid #d0d0d0; + background: #ffffff; + margin: -1px 0 0 0; border-top: 0 none; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } - .selectize-dropdown [data-selectable] { - overflow: hidden; cursor: pointer; + overflow: hidden; } - .selectize-dropdown [data-selectable] .highlight { background: rgba(125, 168, 208, 0.2); -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; } - .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header { padding: 5px 8px; } - .selectize-dropdown .optgroup:first-child .optgroup-header { border-top: 0 none; } - .selectize-dropdown .optgroup-header { color: #303030; - cursor: default; background: #ffffff; + cursor: default; } - .selectize-dropdown .active { - color: #495c68; background-color: #f5fafd; + color: #495c68; } - .selectize-dropdown .active.create { color: #495c68; } - .selectize-dropdown .create { color: rgba(48, 48, 48, 0.5); } - .selectize-dropdown-content { - max-height: 200px; - overflow-x: hidden; overflow-y: auto; + overflow-x: hidden; + max-height: 200px; } - .selectize-control.single .selectize-input, .selectize-control.single .selectize-input input { cursor: pointer; } - .selectize-control.single .selectize-input.input-active, .selectize-control.single .selectize-input.input-active input { cursor: text; } - .selectize-control.single .selectize-input:after { + content: ' '; + display: block; position: absolute; top: 50%; right: 15px; - display: block; + margin-top: -3px; width: 0; height: 0; - margin-top: -3px; - border-color: #808080 transparent transparent transparent; border-style: solid; border-width: 5px 5px 0 5px; - content: ' '; + border-color: #808080 transparent transparent transparent; } - .selectize-control.single .selectize-input.dropdown-active:after { margin-top: -4px; - border-color: transparent transparent #808080 transparent; border-width: 0 5px 5px 5px; + border-color: transparent transparent #808080 transparent; } - .selectize-control.rtl.single .selectize-input:after { - right: auto; left: 15px; + right: auto; } - .selectize-control.rtl .selectize-input > input { margin: 0 4px 0 -2px !important; } - .selectize-control .selectize-input.disabled { - background-color: #fafafa; opacity: 0.5; -} \ No newline at end of file + background-color: #fafafa; +} diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.default.css b/xadmin/static/xadmin/vendor/selectize/selectize.default.css index cfdc0151d..ffd219c46 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.default.css +++ b/xadmin/static/xadmin/vendor/selectize/selectize.default.css @@ -1,6 +1,6 @@ /** - * selectize.default.css (v0.8.4) - Default Theme - * Copyright (c) 2013 Brian Reavis & contributors + * selectize.default.css (v0.12.1) - Default Theme + * Copyright (c) 2013–2015 Brian Reavis & contributors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this * file except in compliance with the License. You may obtain a copy of the License at: @@ -13,376 +13,330 @@ * * @author Brian Reavis */ - .selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder { + visibility: visible !important; background: #f2f2f2 !important; background: rgba(0, 0, 0, 0.06) !important; border: 0 none !important; - visibility: visible !important; -webkit-box-shadow: inset 0 0 12px 4px #ffffff; - box-shadow: inset 0 0 12px 4px #ffffff; + box-shadow: inset 0 0 12px 4px #ffffff; } - .selectize-control.plugin-drag_drop .ui-sortable-placeholder::after { content: '!'; visibility: hidden; } - .selectize-control.plugin-drag_drop .ui-sortable-helper { -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); } - .selectize-dropdown-header { position: relative; padding: 5px 8px; - background: #f8f8f8; border-bottom: 1px solid #d0d0d0; + background: #f8f8f8; -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-dropdown-header-close { position: absolute; - top: 50%; right: 8px; - margin-top: -12px; - font-size: 20px !important; - line-height: 20px; + top: 50%; color: #303030; opacity: 0.4; + margin-top: -12px; + line-height: 20px; + font-size: 20px !important; } - .selectize-dropdown-header-close:hover { color: #000000; } - .selectize-dropdown.plugin-optgroup_columns .optgroup { - float: left; - border-top: 0 none; border-right: 1px solid #f2f2f2; + border-top: 0 none; + float: left; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:last-child { border-right: 0 none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:before { display: none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup-header { border-top: 0 none; } - .selectize-control.plugin-remove_button [data-value] { position: relative; padding-right: 24px !important; } - .selectize-control.plugin-remove_button [data-value] .remove { + z-index: 1; + /* fixes ie bug (see #392) */ position: absolute; top: 0; right: 0; bottom: 0; - display: inline-block; width: 17px; - padding: 2px 0 0 0; - font-size: 12px; + text-align: center; font-weight: bold; + font-size: 12px; color: inherit; - text-align: center; text-decoration: none; vertical-align: middle; + display: inline-block; + padding: 2px 0 0 0; border-left: 1px solid #0073bb; -webkit-border-radius: 0 2px 2px 0; - -moz-border-radius: 0 2px 2px 0; - border-radius: 0 2px 2px 0; + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-control.plugin-remove_button [data-value] .remove:hover { background: rgba(0, 0, 0, 0.05); } - .selectize-control.plugin-remove_button [data-value].active .remove { border-left-color: #00578d; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove:hover { background: none; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove { border-left-color: #aaaaaa; } - .selectize-control { position: relative; } - .selectize-dropdown, .selectize-input, .selectize-input input { + color: #303030; font-family: inherit; font-size: 13px; - -webkit-font-smoothing: inherit; line-height: 18px; - color: #303030; + -webkit-font-smoothing: inherit; } - .selectize-input, .selectize-control.single .selectize-input.input-active { - display: inline-block; - cursor: text; background: #ffffff; + cursor: text; + display: inline-block; } - .selectize-input { - position: relative; - z-index: 1; + border: 1px solid #d0d0d0; + padding: 8px 8px; display: inline-block; width: 100%; - padding: 8px 8px; overflow: hidden; - border: 1px solid #d0d0d0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + position: relative; + z-index: 1; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } - .selectize-control.multi .selectize-input.has-items { padding: 5px 8px 2px; } - .selectize-input.full { background-color: #ffffff; } - .selectize-input.disabled, .selectize-input.disabled * { cursor: default !important; } - .selectize-input.focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); } - .selectize-input.dropdown-active { -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-input > * { + vertical-align: baseline; display: -moz-inline-stack; display: inline-block; - *display: inline; - vertical-align: baseline; zoom: 1; + *display: inline; } - .selectize-control.multi .selectize-input > div { - padding: 2px 6px; - margin: 0 3px 3px 0; - color: #ffffff; cursor: pointer; + margin: 0 3px 3px 0; + padding: 2px 6px; background: #1da7ee; + color: #ffffff; border: 1px solid #0073bb; } - .selectize-control.multi .selectize-input > div.active { - color: #ffffff; background: #92c836; + color: #ffffff; border: 1px solid #00578d; } - .selectize-control.multi .selectize-input.disabled > div, .selectize-control.multi .selectize-input.disabled > div.active { color: #ffffff; background: #d2d2d2; border: 1px solid #aaaaaa; } - .selectize-input > input { - max-width: 100% !important; - max-height: none !important; - min-height: 0 !important; + display: inline-block !important; padding: 0 !important; + min-height: 0 !important; + max-height: none !important; + max-width: 100% !important; margin: 0 1px !important; - line-height: inherit !important; text-indent: 0 !important; - background: none !important; border: 0 none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + background: none !important; + line-height: inherit !important; -webkit-user-select: auto !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} +.selectize-input > input::-ms-clear { + display: none; } - .selectize-input > input:focus { outline: none !important; } - .selectize-input::after { + content: ' '; display: block; clear: left; - content: ' '; } - .selectize-input.dropdown-active::before { + content: ' '; + display: block; position: absolute; - right: 0; + background: #f0f0f0; + height: 1px; bottom: 0; left: 0; - display: block; - height: 1px; - background: #f0f0f0; - content: ' '; + right: 0; } - .selectize-dropdown { position: absolute; z-index: 10; - margin: -1px 0 0 0; - background: #ffffff; border: 1px solid #d0d0d0; + background: #ffffff; + margin: -1px 0 0 0; border-top: 0 none; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } - .selectize-dropdown [data-selectable] { - overflow: hidden; cursor: pointer; + overflow: hidden; } - .selectize-dropdown [data-selectable] .highlight { background: rgba(125, 168, 208, 0.2); -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; } - .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header { padding: 5px 8px; } - .selectize-dropdown .optgroup:first-child .optgroup-header { border-top: 0 none; } - .selectize-dropdown .optgroup-header { color: #303030; - cursor: default; background: #ffffff; + cursor: default; } - .selectize-dropdown .active { - color: #495c68; background-color: #f5fafd; + color: #495c68; } - .selectize-dropdown .active.create { color: #495c68; } - .selectize-dropdown .create { color: rgba(48, 48, 48, 0.5); } - .selectize-dropdown-content { - max-height: 200px; - overflow-x: hidden; overflow-y: auto; + overflow-x: hidden; + max-height: 200px; } - .selectize-control.single .selectize-input, .selectize-control.single .selectize-input input { cursor: pointer; } - .selectize-control.single .selectize-input.input-active, .selectize-control.single .selectize-input.input-active input { cursor: text; } - .selectize-control.single .selectize-input:after { + content: ' '; + display: block; position: absolute; top: 50%; right: 15px; - display: block; + margin-top: -3px; width: 0; height: 0; - margin-top: -3px; - border-color: #808080 transparent transparent transparent; border-style: solid; border-width: 5px 5px 0 5px; - content: ' '; + border-color: #808080 transparent transparent transparent; } - .selectize-control.single .selectize-input.dropdown-active:after { margin-top: -4px; - border-color: transparent transparent #808080 transparent; border-width: 0 5px 5px 5px; + border-color: transparent transparent #808080 transparent; } - .selectize-control.rtl.single .selectize-input:after { - right: auto; left: 15px; + right: auto; } - .selectize-control.rtl .selectize-input > input { margin: 0 4px 0 -2px !important; } - .selectize-control .selectize-input.disabled { - background-color: #fafafa; opacity: 0.5; + background-color: #fafafa; } - .selectize-control.multi .selectize-input.has-items { - padding-right: 5px; padding-left: 5px; + padding-right: 5px; } - .selectize-control.multi .selectize-input.disabled [data-value] { color: #999; text-shadow: none; background: none; -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } - .selectize-control.multi .selectize-input.disabled [data-value], .selectize-control.multi .selectize-input.disabled [data-value] .remove { border-color: #e6e6e6; } - .selectize-control.multi .selectize-input.disabled [data-value] .remove { background: none; } - .selectize-control.multi .selectize-input [data-value] { text-shadow: 0 1px 0 rgba(0, 51, 83, 0.3); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; background-color: #1b9dec; background-image: -moz-linear-gradient(top, #1da7ee, #178ee9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1da7ee), to(#178ee9)); @@ -390,14 +344,10 @@ background-image: -o-linear-gradient(top, #1da7ee, #178ee9); background-image: linear-gradient(to bottom, #1da7ee, #178ee9); background-repeat: repeat-x; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff1da7ee', endColorstr='#ff178ee9', GradientType=0); - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 1px rgba(255, 255, 255, 0.03); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 1px rgba(255, 255, 255, 0.03); + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03); + box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03); } - .selectize-control.multi .selectize-input [data-value].active { background-color: #0085d4; background-image: -moz-linear-gradient(top, #008fd8, #0075cf); @@ -408,8 +358,9 @@ background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff008fd8', endColorstr='#ff0075cf', GradientType=0); } - .selectize-control.single .selectize-input { + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8); + box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8); background-color: #f9f9f9; background-image: -moz-linear-gradient(top, #fefefe, #f2f2f2); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#f2f2f2)); @@ -418,25 +369,19 @@ background-image: linear-gradient(to bottom, #fefefe, #f2f2f2); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffefefe', endColorstr='#fff2f2f2', GradientType=0); - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 1px 0 rgba(255, 255, 255, 0.8); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05), inset 0 1px 0 rgba(255, 255, 255, 0.8); } - .selectize-control.single .selectize-input, .selectize-dropdown.single { border-color: #b8b8b8; } - .selectize-dropdown .optgroup-header { padding-top: 7px; - font-size: 0.85em; font-weight: bold; + font-size: 0.85em; } - .selectize-dropdown .optgroup { border-top: 1px solid #f0f0f0; } - .selectize-dropdown .optgroup:first-child { border-top: 0 none; -} \ No newline at end of file +} diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.js b/xadmin/static/xadmin/vendor/selectize/selectize.js index 28d56bbc9..e8c091408 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.js +++ b/xadmin/static/xadmin/vendor/selectize/selectize.js @@ -16,7 +16,7 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { - define(factory); + define('sifter', factory); } else if (typeof exports === 'object') { module.exports = factory(); } else { @@ -221,7 +221,7 @@ * @param {object} result * @return {mixed} */ - get_field = function(name, result) { + get_field = function(name, result) { if (name === '$score') return result.score; return self.items[result.id][name]; }; @@ -391,8 +391,8 @@ if (typeof a === 'number' && typeof b === 'number') { return a > b ? 1 : (a < b ? -1 : 0); } - a = String(a || '').toLowerCase(); - b = String(b || '').toLowerCase(); + a = asciifold(String(a || '')); + b = asciifold(String(b || '')); if (a > b) return 1; if (b > a) return -1; return 0; @@ -425,19 +425,44 @@ }; var DIACRITICS = { - 'a': '[aÀÁÂÃÄÅàáâãäå]', + 'a': '[aÀÁÂÃÄÅàáâãäåĀāąĄ]', 'c': '[cÇçćĆčČ]', - 'd': '[dđĐ]', - 'e': '[eÈÉÊËèéêë]', - 'i': '[iÌÍÎÏìíîï]', - 'n': '[nÑñ]', - 'o': '[oÒÓÔÕÕÖØòóôõöø]', - 's': '[sŠš]', - 'u': '[uÙÚÛÜùúûü]', - 'y': '[yŸÿý]', - 'z': '[zŽž]' + 'd': '[dđĐďĎ]', + 'e': '[eÈÉÊËèéêëěĚĒēęĘ]', + 'i': '[iÌÍÎÏìíîïĪī]', + 'l': '[lłŁ]', + 'n': '[nÑñňŇńŃ]', + 'o': '[oÒÓÔÕÕÖØòóôõöøŌō]', + 'r': '[rřŘ]', + 's': '[sŠšśŚ]', + 't': '[tťŤ]', + 'u': '[uÙÚÛÜùúûüůŮŪū]', + 'y': '[yŸÿýÝ]', + 'z': '[zŽžżŻźŹ]' }; + var asciifold = (function() { + var i, n, k, chunk; + var foreignletters = ''; + var lookup = {}; + for (k in DIACRITICS) { + if (DIACRITICS.hasOwnProperty(k)) { + chunk = DIACRITICS[k].substring(2, DIACRITICS[k].length - 1); + foreignletters += chunk; + for (i = 0, n = chunk.length; i < n; i++) { + lookup[chunk.charAt(i)] = k; + } + } + } + var regexp = new RegExp('[' + foreignletters + ']', 'g'); + return function(str) { + return str.replace(regexp, function(foreignletter) { + return lookup[foreignletter]; + }).toLowerCase(); + }; + })(); + + // export // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -464,7 +489,7 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { - define(factory); + define('microplugin', factory); } else if (typeof exports === 'object') { module.exports = factory(); } else { @@ -583,8 +608,8 @@ })); /** - * selectize.js (v0.8.4) - * Copyright (c) 2013 Brian Reavis & contributors + * selectize.js (v0.12.1) + * Copyright (c) 2013–2015 Brian Reavis & contributors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this * file except in compliance with the License. You may obtain a copy of the License at: @@ -603,7 +628,9 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { - define(['jquery','sifter','microplugin'], factory); + define('selectize', ['jquery','sifter','microplugin'], factory); + } else if (typeof exports === 'object') { + module.exports = factory(require('jquery'), require('sifter'), require('microplugin')); } else { root.Selectize = factory(root.jQuery, root.Sifter, root.MicroPlugin); } @@ -689,8 +716,10 @@ var KEY_ESC = 27; var KEY_LEFT = 37; var KEY_UP = 38; + var KEY_P = 80; var KEY_RIGHT = 39; var KEY_DOWN = 40; + var KEY_N = 78; var KEY_BACKSPACE = 8; var KEY_DELETE = 46; var KEY_SHIFT = 16; @@ -701,6 +730,9 @@ var TAG_SELECT = 1; var TAG_INPUT = 2; + // for now, android support in general is too spotty to support validity + var SUPPORTS_VALIDITY_API = !/android/i.test(window.navigator.userAgent) && !!document.createElement('form').validity; + var isset = function(object) { return typeof object !== 'undefined'; }; @@ -719,10 +751,10 @@ * 1 -> '1' * * @param {string} value - * @returns {string} + * @returns {string|null} */ var hash_key = function(value) { - if (typeof value === 'undefined' || value === null) return ''; + if (typeof value === 'undefined' || value === null) return null; if (typeof value === 'boolean') return value ? '1' : '0'; return value + ''; }; @@ -786,25 +818,6 @@ }; }; - /** - * Builds a hash table out of an array of - * objects, using the specified `key` within - * each object. - * - * @param {string} key - * @param {mixed} objects - */ - var build_hash_table = function(key, objects) { - if (!$.isArray(objects)) return objects; - var i, n, table = {}; - for (i = 0, n = objects.length; i < n; i++) { - if (objects[i].hasOwnProperty(key)) { - table[objects[i][key]] = objects[i]; - } - } - return table; - }; - /** * Wraps `fn` so that it can only be invoked once. * @@ -947,6 +960,10 @@ * @returns {int} */ var measureString = function(str, $parent) { + if (!str) { + return 0; + } + var $test = $('').css({ position: 'absolute', top: -99999, @@ -980,13 +997,16 @@ * @param {object} $input */ var autoGrow = function($input) { - var update = function(e) { + var currentWidth = null; + + var update = function(e, options) { var value, keyCode, printable, placeholder, width; var shift, character, selection; e = e || window.event || {}; + options = options || {}; if (e.metaKey || e.altKey) return; - if ($input.data('grow') === false) return; + if (!options.force && $input.data('grow') === false) return; value = $input.val(); if (e.type && e.type.toLowerCase() === 'keydown') { @@ -1016,13 +1036,14 @@ } } - placeholder = $input.attr('placeholder') || ''; - if (!value.length && placeholder.length) { + placeholder = $input.attr('placeholder'); + if (!value && placeholder) { value = placeholder; } width = measureString(value, $input) + 4; - if (width !== $input.width()) { + if (width !== currentWidth) { + currentWidth = width; $input.width(width); $input.triggerHandler('resize'); } @@ -1038,13 +1059,16 @@ input.selectize = self; // detect rtl environment - dir = window.getComputedStyle ? window.getComputedStyle(input, null).getPropertyValue('direction') : input.currentStyle && input.currentStyle.direction; + var computedStyle = window.getComputedStyle && window.getComputedStyle(input, null); + dir = computedStyle ? computedStyle.getPropertyValue('direction') : input.currentStyle && input.currentStyle.direction; dir = dir || $input.parents('[dir]:first').attr('dir') || ''; // setup default state $.extend(self, { + order : 0, settings : settings, $input : $input, + tabIndex : $input.attr('tabindex') || '', tagType : input.tagName.toLowerCase() === 'select' ? TAG_SELECT : TAG_INPUT, rtl : /rtl/i.test(dir), @@ -1062,6 +1086,7 @@ isCmdDown : false, isCtrlDown : false, ignoreFocus : false, + ignoreBlur : false, ignoreHover : false, hasOptions : false, currentResults : null, @@ -1078,19 +1103,27 @@ userOptions : {}, items : [], renderCache : {}, - onSearchChange : debounce(self.onSearchChange, settings.loadThrottle) + onSearchChange : settings.loadThrottle === null ? self.onSearchChange : debounce(self.onSearchChange, settings.loadThrottle) }); // search system self.sifter = new Sifter(this.options, {diacritics: settings.diacritics}); // build options table - $.extend(self.options, build_hash_table(settings.valueField, settings.options)); - delete self.settings.options; + if (self.settings.options) { + for (i = 0, n = self.settings.options.length; i < n; i++) { + self.registerOption(self.settings.options[i]); + } + delete self.settings.options; + } // build optgroup table - $.extend(self.optgroups, build_hash_table(settings.optgroupValueField, settings.optgroups)); - delete self.settings.optgroups; + if (self.settings.optgroups) { + for (i = 0, n = self.settings.optgroups.length; i < n; i++) { + self.registerOptionGroup(self.settings.optgroups[i]); + } + delete self.settings.optgroups; + } // option-dependent defaults self.settings.mode = self.settings.mode || (self.settings.maxItems === 1 ? 'single' : 'multi'); @@ -1124,6 +1157,7 @@ var eventNS = self.eventNS; var $window = $(window); var $document = $(document); + var $input = self.$input; var $wrapper; var $control; @@ -1134,23 +1168,25 @@ var inputMode; var timeout_blur; var timeout_focus; - var tab_index; var classes; var classes_plugins; inputMode = self.settings.mode; - tab_index = self.$input.attr('tabindex') || ''; - classes = self.$input.attr('class') || ''; + classes = $input.attr('class') || ''; $wrapper = $('
    ').addClass(settings.wrapperClass).addClass(classes).addClass(inputMode); $control = $('
    ').addClass(settings.inputClass).addClass('items').appendTo($wrapper); - $control_input = $('').appendTo($control).attr('tabindex', tab_index); + $control_input = $('').appendTo($control).attr('tabindex', $input.is(':disabled') ? '-1' : self.tabIndex); $dropdown_parent = $(settings.dropdownParent || $wrapper); - $dropdown = $('
    ').addClass(settings.dropdownClass).addClass(classes).addClass(inputMode).hide().appendTo($dropdown_parent); + $dropdown = $('
    ').addClass(settings.dropdownClass).addClass(inputMode).hide().appendTo($dropdown_parent); $dropdown_content = $('
    ').addClass(settings.dropdownContentClass).appendTo($dropdown); + if(self.settings.copyClassesToDropdown) { + $dropdown.addClass(classes); + } + $wrapper.css({ - width: self.$input[0].style.width + width: $input[0].style.width }); if (self.plugins.names.length) { @@ -1160,13 +1196,27 @@ } if ((settings.maxItems === null || settings.maxItems > 1) && self.tagType === TAG_SELECT) { - self.$input.attr('multiple', 'multiple'); + $input.attr('multiple', 'multiple'); } if (self.settings.placeholder) { $control_input.attr('placeholder', settings.placeholder); } + // if splitOn was not passed in, construct it from the delimiter to allow pasting universally + if (!self.settings.splitOn && self.settings.delimiter) { + var delimiterEscaped = self.settings.delimiter.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); + self.settings.splitOn = new RegExp('\\s*' + delimiterEscaped + '+\\s*'); + } + + if ($input.attr('autocorrect')) { + $control_input.attr('autocorrect', $input.attr('autocorrect')); + } + + if ($input.attr('autocapitalize')) { + $control_input.attr('autocapitalize', $input.attr('autocapitalize')); + } + self.$wrapper = $wrapper; self.$control = $control; self.$control_input = $control_input; @@ -1174,7 +1224,7 @@ self.$dropdown_content = $dropdown_content; $dropdown.on('mouseenter', '[data-selectable]', function() { return self.onOptionHover.apply(self, arguments); }); - $dropdown.on('mousedown', '[data-selectable]', function() { return self.onOptionSelect.apply(self, arguments); }); + $dropdown.on('mousedown click', '[data-selectable]', function() { return self.onOptionSelect.apply(self, arguments); }); watchChildEvent($control, 'mousedown', '*:not(input)', function() { return self.onItemSelect.apply(self, arguments); }); autoGrow($control_input); @@ -1190,7 +1240,8 @@ keypress : function() { return self.onKeyPress.apply(self, arguments); }, resize : function() { self.positionDropdown.apply(self, []); }, blur : function() { return self.onBlur.apply(self, arguments); }, - focus : function() { return self.onFocus.apply(self, arguments); } + focus : function() { self.ignoreBlur = false; return self.onFocus.apply(self, arguments); }, + paste : function() { return self.onPaste.apply(self, arguments); } }); $document.on('keydown' + eventNS, function(e) { @@ -1213,7 +1264,7 @@ } // blur on click outside if (!self.$control.has(e.target).length && e.target !== self.$control[0]) { - self.blur(); + self.blur(e.target); } } }); @@ -1230,11 +1281,11 @@ // store original children and tab index so that they can be // restored when the destroy() method is called. this.revertSettings = { - $children : self.$input.children().detach(), - tabindex : self.$input.attr('tabindex') + $children : $input.children().detach(), + tabindex : $input.attr('tabindex') }; - self.$input.attr('tabindex', -1).hide().after(self.$wrapper); + $input.attr('tabindex', -1).hide().after(self.$wrapper); if ($.isArray(settings.items)) { self.setValue(settings.items); @@ -1242,8 +1293,8 @@ } // feature detect for the validation API - if (self.$input[0].validity) { - self.$input.on('invalid' + eventNS, function(e) { + if (SUPPORTS_VALIDITY_API) { + $input.on('invalid' + eventNS, function(e) { e.preventDefault(); self.isInvalid = true; self.refreshState(); @@ -1256,17 +1307,21 @@ self.updatePlaceholder(); self.isSetup = true; - if (self.$input.is(':disabled')) { + if ($input.is(':disabled')) { self.disable(); } self.on('change', this.onChange); + + $input.data('selectize', self); + $input.addClass('selectized'); self.trigger('initialize'); // preload options - if (settings.preload) { + if (settings.preload === true) { self.onSearchChange(''); } + }, /** @@ -1304,17 +1359,23 @@ */ setupCallbacks: function() { var key, fn, callbacks = { - 'initialize' : 'onInitialize', - 'change' : 'onChange', - 'item_add' : 'onItemAdd', - 'item_remove' : 'onItemRemove', - 'clear' : 'onClear', - 'option_add' : 'onOptionAdd', - 'option_remove' : 'onOptionRemove', - 'option_clear' : 'onOptionClear', - 'dropdown_open' : 'onDropdownOpen', - 'dropdown_close' : 'onDropdownClose', - 'type' : 'onType' + 'initialize' : 'onInitialize', + 'change' : 'onChange', + 'item_add' : 'onItemAdd', + 'item_remove' : 'onItemRemove', + 'clear' : 'onClear', + 'option_add' : 'onOptionAdd', + 'option_remove' : 'onOptionRemove', + 'option_clear' : 'onOptionClear', + 'optgroup_add' : 'onOptionGroupAdd', + 'optgroup_remove' : 'onOptionGroupRemove', + 'optgroup_clear' : 'onOptionGroupClear', + 'dropdown_open' : 'onDropdownOpen', + 'dropdown_close' : 'onDropdownClose', + 'type' : 'onType', + 'load' : 'onLoad', + 'focus' : 'onFocus', + 'blur' : 'onBlur' }; for (key in callbacks) { @@ -1387,6 +1448,30 @@ this.$input.trigger('change'); }, + /** + * Triggered on paste. + * + * @param {object} e + * @returns {boolean} + */ + onPaste: function(e) { + var self = this; + if (self.isFull() || self.isInputHidden || self.isLocked) { + e.preventDefault(); + } else { + // If a regex or string is included, this will split the pasted + // input and create Items for each separate value + if (self.settings.splitOn) { + setTimeout(function() { + var splitInput = $.trim(self.$control_input.val() || '').split(self.settings.splitOn); + for (var i = 0, n = splitInput.length; i < n; i++) { + self.createItem(splitInput[i]); + } + }, 0); + } + } + }, + /** * Triggered on keypress. * @@ -1396,7 +1481,7 @@ onKeyPress: function(e) { if (this.isLocked) return e && e.preventDefault(); var character = String.fromCharCode(e.keyCode || e.which); - if (this.settings.create && character === this.settings.delimiter) { + if (this.settings.create && this.settings.mode === 'multi' && character === this.settings.delimiter) { this.createItem(); e.preventDefault(); return false; @@ -1428,8 +1513,14 @@ } break; case KEY_ESC: - self.close(); + if (self.isOpen) { + e.preventDefault(); + e.stopPropagation(); + self.close(); + } return; + case KEY_N: + if (!e.ctrlKey || e.altKey) break; case KEY_DOWN: if (!self.isOpen && self.hasOptions) { self.open(); @@ -1440,6 +1531,8 @@ } e.preventDefault(); return; + case KEY_P: + if (!e.ctrlKey || e.altKey) break; case KEY_UP: if (self.$activeOption) { self.ignoreHover = true; @@ -1451,8 +1544,8 @@ case KEY_RETURN: if (self.isOpen && self.$activeOption) { self.onOptionSelect({currentTarget: self.$activeOption}); + e.preventDefault(); } - e.preventDefault(); return; case KEY_LEFT: self.advanceSelection(-1, e); @@ -1461,6 +1554,15 @@ self.advanceSelection(1, e); return; case KEY_TAB: + if (self.settings.selectOnTab && self.isOpen && self.$activeOption) { + self.onOptionSelect({currentTarget: self.$activeOption}); + + // Default behaviour is to jump to the next field, we only want this + // if the current field doesn't accept any more entries + if (!self.isFull()) { + e.preventDefault(); + } + } if (self.settings.create && self.createItem()) { e.preventDefault(); } @@ -1470,7 +1572,8 @@ self.deleteSelection(e); return; } - if (self.isFull() || self.isInputHidden) { + + if ((self.isFull() || self.isInputHidden) && !(IS_MAC ? e.metaKey : e.ctrlKey)) { e.preventDefault(); return; } @@ -1522,8 +1625,8 @@ */ onFocus: function(e) { var self = this; + var wasFocused = self.isFocused; - self.isFocused = true; if (self.isDisabled) { self.blur(); e && e.preventDefault(); @@ -1531,8 +1634,11 @@ } if (self.ignoreFocus) return; + self.isFocused = true; if (self.settings.preload === 'focus') self.onSearchChange(''); + if (!wasFocused) self.trigger('focus'); + if (!self.$activeItems.length) { self.showInput(); self.setActiveItem(null); @@ -1546,23 +1652,43 @@ * Triggered on blur. * * @param {object} e - * @returns {boolean} + * @param {Element} dest */ - onBlur: function(e) { + onBlur: function(e, dest) { var self = this; + if (!self.isFocused) return; self.isFocused = false; - if (self.ignoreFocus) return; - if (self.settings.create && self.settings.createOnBlur) { - self.createItem(); + if (self.ignoreFocus) { + return; + } else if (!self.ignoreBlur && document.activeElement === self.$dropdown_content[0]) { + // necessary to prevent IE closing the dropdown when the scrollbar is clicked + self.ignoreBlur = true; + self.onFocus(e); + return; } - self.close(); - self.setTextboxValue(''); - self.setActiveItem(null); - self.setActiveOption(null); - self.setCaret(self.items.length); - self.refreshState(); + var deactivate = function() { + self.close(); + self.setTextboxValue(''); + self.setActiveItem(null); + self.setActiveOption(null); + self.setCaret(self.items.length); + self.refreshState(); + + // IE11 bug: element still marked as active + (dest || document.body).focus(); + + self.ignoreFocus = false; + self.trigger('blur'); + }; + + self.ignoreFocus = true; + if (self.settings.create && self.settings.createOnBlur) { + self.createItem(null, false, deactivate); + } else { + deactivate(); + } }, /** @@ -1594,14 +1720,20 @@ $target = $(e.currentTarget); if ($target.hasClass('create')) { - self.createItem(); + self.createItem(null, function() { + if (self.settings.closeAfterSelect) { + self.close(); + } + }); } else { value = $target.attr('data-value'); - if (value) { + if (typeof value !== 'undefined') { self.lastQuery = null; self.setTextboxValue(''); self.addItem(value); - if (!self.settings.hideSelected && e.type && /mouse/.test(e.type)) { + if (self.settings.closeAfterSelect) { + self.close(); + } else if (!self.settings.hideSelected && e.type && /mouse/.test(e.type)) { self.setActiveOption(self.getOption(value)); } } @@ -1634,7 +1766,7 @@ */ load: function(fn) { var self = this; - var $wrapper = self.$wrapper.addClass('loading'); + var $wrapper = self.$wrapper.addClass(self.settings.loadingClass); self.loading++; fn.apply(self, [function(results) { @@ -1644,7 +1776,7 @@ self.refreshOptions(self.isFocused && !self.isInputHidden); } if (!self.loading) { - $wrapper.removeClass('loading'); + $wrapper.removeClass(self.settings.loadingClass); } self.trigger('load', results); }]); @@ -1656,8 +1788,12 @@ * @param {string} value */ setTextboxValue: function(value) { - this.$control_input.val(value).triggerHandler('update'); - this.lastValue = value; + var $input = this.$control_input; + var changed = $input.val() !== value; + if (changed) { + $input.val(value).triggerHandler('update'); + this.lastValue = value; + } }, /** @@ -1681,13 +1817,12 @@ * * @param {mixed} value */ - setValue: function(value) { - debounce_events(this, ['change'], function() { - this.clear(); - var items = $.isArray(value) ? value : [value]; - for (var i = 0, n = items.length; i < n; i++) { - this.addItem(items[i]); - } + setValue: function(value, silent) { + var events = silent ? [] : ['change']; + + debounce_events(this, events, function() { + this.clear(silent); + this.addItems(value, silent); }); }, @@ -1799,12 +1934,15 @@ * Selects all items (CTRL + A). */ selectAll: function() { - this.$activeItems = Array.prototype.slice.apply(this.$control.children(':not(input)').addClass('active')); - if (this.$activeItems.length) { - this.hideInput(); - this.close(); + var self = this; + if (self.settings.mode === 'single') return; + + self.$activeItems = Array.prototype.slice.apply(self.$control.children(':not(input)').addClass('active')); + if (self.$activeItems.length) { + self.hideInput(); + self.close(); } - this.focus(); + self.focus(); }, /** @@ -1828,11 +1966,7 @@ }, /** - * Gives the control focus. If "trigger" is falsy, - * focus handlers won't be fired--causing the focus - * to happen silently in the background. - * - * @param {boolean} trigger + * Gives the control focus. */ focus: function() { var self = this; @@ -1848,9 +1982,12 @@ /** * Forces the control out of focus. + * + * @param {Element} dest */ - blur: function() { - this.$control_input.trigger('blur'); + blur: function(dest) { + this.$control_input[0].blur(); + this.onBlur(null, dest); }, /** @@ -1877,7 +2014,7 @@ var settings = this.settings; var sort = settings.sortField; if (typeof sort === 'string') { - sort = {field: sort}; + sort = [{field: sort}]; } return { @@ -1951,7 +2088,7 @@ } var self = this; - var query = self.$control_input.val(); + var query = $.trim(self.$control_input.val()); var results = self.search(query); var $dropdown_content = self.$dropdown_content; var active_before = self.$activeOption && hash_key(self.$activeOption.attr('data-value')); @@ -1964,15 +2101,7 @@ // render and group available options individually groups = {}; - - if (self.settings.optgroupOrder) { - groups_order = self.settings.optgroupOrder; - for (i = 0; i < groups_order.length; i++) { - groups[groups_order[i]] = []; - } - } else { - groups_order = []; - } + groups_order = []; for (i = 0; i < n; i++) { option = self.options[results.items[i].id]; @@ -1993,6 +2122,15 @@ } } + // sort optgroups + if (this.settings.lockOptgroupOrder) { + groups_order.sort(function(a, b) { + var a_order = self.optgroups[a].$order || 0; + var b_order = self.optgroups[b].$order || 0; + return a_order - b_order; + }); + } + // render optgroup headers & join groups html = []; for (i = 0, n = groups_order.length; i < n; i++) { @@ -2027,7 +2165,7 @@ } // add create option - has_create_option = self.settings.create && results.query.length; + has_create_option = self.canCreate(query); if (has_create_option) { $dropdown_content.prepend(self.render('option_create', {input: query})); $create = $($dropdown_content[0].childNodes[0]); @@ -2071,10 +2209,10 @@ * * this.addOption(data) * - * @param {object} data + * @param {object|array} data */ addOption: function(data) { - var i, n, optgroup, value, self = this; + var i, n, value, self = this; if ($.isArray(data)) { for (i = 0, n = data.length; i < n; i++) { @@ -2083,13 +2221,40 @@ return; } - value = hash_key(data[self.settings.valueField]); - if (!value || self.options.hasOwnProperty(value)) return; + if (value = self.registerOption(data)) { + self.userOptions[value] = true; + self.lastQuery = null; + self.trigger('option_add', value, data); + } + }, - self.userOptions[value] = true; - self.options[value] = data; - self.lastQuery = null; - self.trigger('option_add', value, data); + /** + * Registers an option to the pool of options. + * + * @param {object} data + * @return {boolean|string} + */ + registerOption: function(data) { + var key = hash_key(data[this.settings.valueField]); + if (!key || this.options.hasOwnProperty(key)) return false; + data.$order = data.$order || ++this.order; + this.options[key] = data; + return key; + }, + + /** + * Registers an option group to the pool of option groups. + * + * @param {object} data + * @return {boolean|string} + */ + registerOptionGroup: function(data) { + var key = hash_key(data[this.settings.optgroupValueField]); + if (!key) return false; + + data.$order = data.$order || ++this.order; + this.optgroups[key] = data; + return key; }, /** @@ -2100,8 +2265,32 @@ * @param {object} data */ addOptionGroup: function(id, data) { - this.optgroups[id] = data; - this.trigger('optgroup_add', id, data); + data[this.settings.optgroupValueField] = id; + if (id = this.registerOptionGroup(data)) { + this.trigger('optgroup_add', id, data); + } + }, + + /** + * Removes an existing option group. + * + * @param {string} id + */ + removeOptionGroup: function(id) { + if (this.optgroups.hasOwnProperty(id)) { + delete this.optgroups[id]; + this.renderCache = {}; + this.trigger('optgroup_remove', id); + } + }, + + /** + * Clears all existing option groups. + */ + clearOptionGroups: function() { + this.optgroups = {}; + this.renderCache = {}; + this.trigger('optgroup_clear'); }, /** @@ -2115,14 +2304,17 @@ updateOption: function(value, data) { var self = this; var $item, $item_new; - var value_new, index_item, cache_items, cache_options; + var value_new, index_item, cache_items, cache_options, order_old; value = hash_key(value); value_new = hash_key(data[self.settings.valueField]); // sanity checks + if (value === null) return; if (!self.options.hasOwnProperty(value)) return; - if (!value_new) throw new Error('Value must be set in option data'); + if (typeof value_new !== 'string') throw new Error('Value must be set in option data'); + + order_old = self.options[value].$order; // update references if (value_new !== value) { @@ -2132,17 +2324,18 @@ self.items.splice(index_item, 1, value_new); } } + data.$order = data.$order || order_old; self.options[value_new] = data; // invalidate render cache cache_items = self.renderCache['item']; cache_options = self.renderCache['option']; - if (isset(cache_items)) { + if (cache_items) { delete cache_items[value]; delete cache_items[value_new]; } - if (isset(cache_options)) { + if (cache_options) { delete cache_options[value]; delete cache_options[value_new]; } @@ -2155,6 +2348,9 @@ $item.replaceWith($item_new); } + // invalidate last query because we might have updated the sortField + self.lastQuery = null; + // update dropdown contents if (self.isOpen) { self.refreshOptions(false); @@ -2165,16 +2361,22 @@ * Removes a single option. * * @param {string} value + * @param {boolean} silent */ - removeOption: function(value) { + removeOption: function(value, silent) { var self = this; - value = hash_key(value); + + var cache_items = self.renderCache['item']; + var cache_options = self.renderCache['option']; + if (cache_items) delete cache_items[value]; + if (cache_options) delete cache_options[value]; + delete self.userOptions[value]; delete self.options[value]; self.lastQuery = null; self.trigger('option_remove', value); - self.removeItem(value); + self.removeItem(value, silent); }, /** @@ -2185,6 +2387,7 @@ self.loadedSearches = {}; self.userOptions = {}; + self.renderCache = {}; self.options = self.sifter.items = {}; self.lastQuery = null; self.trigger('option_clear'); @@ -2228,7 +2431,7 @@ getElementWithValue: function(value, $els) { value = hash_key(value); - if (value) { + if (typeof value !== 'undefined' && value !== null) { for (var i = 0, n = $els.length; i < n; i++) { if ($els[i].getAttribute('data-value') === value) { return $($els[i]); @@ -2250,18 +2453,36 @@ return this.getElementWithValue(value, this.$control.children()); }, + /** + * "Selects" multiple items at once. Adds them to the list + * at the current caret position. + * + * @param {string} value + * @param {boolean} silent + */ + addItems: function(values, silent) { + var items = $.isArray(values) ? values : [values]; + for (var i = 0, n = items.length; i < n; i++) { + this.isPending = (i < n - 1); + this.addItem(items[i], silent); + } + }, + /** * "Selects" an item. Adds it to the list * at the current caret position. * * @param {string} value + * @param {boolean} silent */ - addItem: function(value) { - debounce_events(this, ['change'], function() { - var $item, $option; + addItem: function(value, silent) { + var events = silent ? [] : ['change']; + + debounce_events(this, events, function() { + var $item, $option, $options; var self = this; var inputMode = self.settings.mode; - var i, active, options, value_next; + var i, active, value_next, wasFull; value = hash_key(value); if (self.items.indexOf(value) !== -1) { @@ -2270,27 +2491,32 @@ } if (!self.options.hasOwnProperty(value)) return; - if (inputMode === 'single') self.clear(); + if (inputMode === 'single') self.clear(silent); if (inputMode === 'multi' && self.isFull()) return; $item = $(self.render('item', self.options[value])); + wasFull = self.isFull(); self.items.splice(self.caretPos, 0, value); self.insertAtCaret($item); - self.refreshState(); + if (!self.isPending || (!wasFull && self.isFull())) { + self.refreshState(); + } if (self.isSetup) { - options = self.$dropdown_content.find('[data-selectable]'); - - // update menu / remove the option - $option = self.getOption(value); - value_next = self.getAdjacentOption($option, 1).attr('data-value'); - self.refreshOptions(self.isFocused && inputMode !== 'single'); - if (value_next) { - self.setActiveOption(self.getOption(value_next)); + $options = self.$dropdown_content.find('[data-selectable]'); + + // update menu / remove the option (if this is not one item being added as part of series) + if (!self.isPending) { + $option = self.getOption(value); + value_next = self.getAdjacentOption($option, 1).attr('data-value'); + self.refreshOptions(self.isFocused && inputMode !== 'single'); + if (value_next) { + self.setActiveOption(self.getOption(value_next)); + } } // hide the menu if the maximum number of items have been selected or no options are left - if (!options.length || (self.settings.maxItems !== null && self.items.length >= self.settings.maxItems)) { + if (!$options.length || self.isFull()) { self.close(); } else { self.positionDropdown(); @@ -2298,7 +2524,7 @@ self.updatePlaceholder(); self.trigger('item_add', value, $item); - self.updateOriginalInput(); + self.updateOriginalInput({silent: silent}); } }); }, @@ -2309,7 +2535,7 @@ * * @param {string} value */ - removeItem: function(value) { + removeItem: function(value, silent) { var self = this; var $item, i, idx; @@ -2327,7 +2553,7 @@ self.items.splice(i, 1); self.lastQuery = null; if (!self.settings.persist && self.userOptions.hasOwnProperty(value)) { - self.removeOption(value); + self.removeOption(value, silent); } if (i < self.caretPos) { @@ -2336,9 +2562,9 @@ self.refreshState(); self.updatePlaceholder(); - self.updateOriginalInput(); + self.updateOriginalInput({silent: silent}); self.positionDropdown(); - self.trigger('item_remove', value); + self.trigger('item_remove', value, $item); } }, @@ -2350,13 +2576,28 @@ * Once this completes, it will be added * to the item list. * + * @param {string} value + * @param {boolean} [triggerDropdown] + * @param {function} [callback] * @return {boolean} */ - createItem: function() { + createItem: function(input, triggerDropdown) { var self = this; - var input = $.trim(self.$control_input.val() || ''); var caret = self.caretPos; - if (!input.length) return false; + input = input || $.trim(self.$control_input.val() || ''); + + var callback = arguments[arguments.length - 1]; + if (typeof callback !== 'function') callback = function() {}; + + if (typeof triggerDropdown !== 'boolean') { + triggerDropdown = true; + } + + if (!self.canCreate(input)) { + callback(); + return false; + } + self.lock(); var setup = (typeof self.settings.create === 'function') ? this.settings.create : function(input) { @@ -2369,15 +2610,16 @@ var create = once(function(data) { self.unlock(); - if (!data || typeof data !== 'object') return; + if (!data || typeof data !== 'object') return callback(); var value = hash_key(data[self.settings.valueField]); - if (!value) return; + if (typeof value !== 'string') return callback(); self.setTextboxValue(''); self.addOption(data); self.setCaret(caret); self.addItem(value); - self.refreshOptions(self.settings.mode !== 'single'); + self.refreshOptions(triggerDropdown && self.settings.mode !== 'single'); + callback(data); }); var output = setup.apply(this, [input, create]); @@ -2395,9 +2637,7 @@ this.lastQuery = null; if (this.isSetup) { - for (var i = 0; i < this.items.length; i++) { - this.addItem(this.items); - } + this.addItem(this.items); } this.refreshState(); @@ -2409,10 +2649,11 @@ * and CSS classes. */ refreshState: function() { - var self = this; - var invalid = self.isRequired && !self.items.length; - if (!invalid) self.isInvalid = false; - self.$control_input.prop('required', invalid); + var invalid, self = this; + if (self.isRequired) { + if (self.items.length) self.isInvalid = false; + self.$control_input.prop('required', invalid); + } self.refreshClasses(); }, @@ -2456,13 +2697,15 @@ * Refreshes the original * element to reflect the current state. */ - updateOriginalInput: function() { - var i, n, options, self = this; + updateOriginalInput: function(opts) { + var i, n, options, label, self = this; + opts = opts || {}; - if (self.$input[0].tagName.toLowerCase() === 'select') { + if (self.tagType === TAG_SELECT) { options = []; for (i = 0, n = self.items.length; i < n; i++) { - options.push(''); + label = self.options[self.items[i]][self.settings.labelField] || ''; + options.push(''); } if (!options.length && !this.$input.attr('multiple')) { options.push(''); @@ -2470,10 +2713,13 @@ self.$input.html(options.join('')); } else { self.$input.val(self.getValue()); + self.$input.attr('value',self.$input.val()); } if (self.isSetup) { - self.trigger('change', self.$input.val()); + if (!opts.silent) { + self.trigger('change', self.$input.val()); + } } }, @@ -2490,7 +2736,7 @@ } else { $input.attr('placeholder', this.settings.placeholder); } - $input.triggerHandler('update'); + $input.triggerHandler('update', {force: true}); }, /** @@ -2548,16 +2794,20 @@ /** * Resets / clears all selected items * from the control. + * + * @param {boolean} silent */ - clear: function() { + clear: function(silent) { var self = this; if (!self.items.length) return; self.$control.children(':not(input)').remove(); self.items = []; + self.lastQuery = null; self.setCaret(0); + self.setActiveItem(null); self.updatePlaceholder(); - self.updateOriginalInput(); + self.updateOriginalInput({silent: silent}); self.refreshState(); self.showInput(); self.trigger('clear'); @@ -2633,6 +2883,7 @@ } self.showInput(); + self.positionDropdown(); self.refreshOptions(true); // select previous option @@ -2723,17 +2974,19 @@ i = Math.max(0, Math.min(self.items.length, i)); } - // the input must be moved by leaving it in place and moving the - // siblings, due to the fact that focus cannot be restored once lost - // on mobile webkit devices - var j, n, fn, $children, $child; - $children = self.$control.children(':not(input)'); - for (j = 0, n = $children.length; j < n; j++) { - $child = $($children[j]).detach(); - if (j < i) { - self.$control_input.before($child); - } else { - self.$control.append($child); + if(!self.isPending) { + // the input must be moved by leaving it in place and moving the + // siblings, due to the fact that focus cannot be restored once lost + // on mobile webkit devices + var j, n, fn, $children, $child; + $children = self.$control.children(':not(input)'); + for (j = 0, n = $children.length; j < n; j++) { + $child = $($children[j]).detach(); + if (j < i) { + self.$control_input.before($child); + } else { + self.$control.append($child); + } } } @@ -2765,6 +3018,7 @@ disable: function() { var self = this; self.$input.prop('disabled', true); + self.$control_input.prop('disabled', true).prop('tabindex', -1); self.isDisabled = true; self.lock(); }, @@ -2776,6 +3030,7 @@ enable: function() { var self = this; self.$input.prop('disabled', false); + self.$control_input.prop('disabled', false).prop('tabindex', self.tabIndex); self.isDisabled = false; self.unlock(); }, @@ -2799,9 +3054,13 @@ .html('') .append(revertSettings.$children) .removeAttr('tabindex') + .removeClass('selectized') .attr({tabindex: revertSettings.tabindex}) .show(); + self.$control_input.removeData('grow'); + self.$input.removeData('selectize'); + $(window).off(eventNS); $(document).off(eventNS); $(document.body).off(eventNS); @@ -2822,7 +3081,7 @@ var html = ''; var cache = false; var self = this; - var regex_tag = /^[\t ]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i; + var regex_tag = /^[\t \r\n]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i; if (templateName === 'option' || templateName === 'item') { value = hash_key(data[self.settings.valueField]); @@ -2860,6 +3119,39 @@ } return html; + }, + + /** + * Clears the render cache for a template. If + * no template is given, clears all render + * caches. + * + * @param {string} templateName + */ + clearCache: function(templateName) { + var self = this; + if (typeof templateName === 'undefined') { + self.renderCache = {}; + } else { + delete self.renderCache[templateName]; + } + }, + + /** + * Determines whether or not to display the + * create item prompt, given a user input. + * + * @param {string} input + * @return {boolean} + */ + canCreate: function(input) { + var self = this; + if (!self.settings.create) return false; + var filter = self.settings.createFilter; + return input.length + && (typeof filter !== 'function' || filter.apply(self, [input])) + && (typeof filter !== 'string' || new RegExp(filter).test(input)) + && (!(filter instanceof RegExp) || filter.test(input)); } }); @@ -2867,22 +3159,31 @@ Selectize.count = 0; Selectize.defaults = { + options: [], + optgroups: [], + plugins: [], delimiter: ',', + splitOn: null, // regexp or string for splitting up values from a paste command persist: true, diacritics: true, create: false, createOnBlur: false, + createFilter: null, highlight: true, openOnFocus: true, maxOptions: 1000, maxItems: null, hideSelected: null, addPrecedence: false, + selectOnTab: false, preload: false, + allowEmptyOption: false, + closeAfterSelect: false, scrollDuration: 60, loadThrottle: 300, + loadingClass: 'loading', dataAttr: 'data-data', optgroupField: 'optgroup', @@ -2890,7 +3191,7 @@ labelField: 'text', optgroupLabelField: 'label', optgroupValueField: 'value', - optgroupOrder: null, + lockOptgroupOrder: false, sortField: '$order', searchField: ['text'], @@ -2904,21 +3205,26 @@ dropdownParent: null, + copyClassesToDropdown: true, + /* - load : null, // function(query, callback) { ... } - score : null, // function(search) { ... } - onInitialize : null, // function() { ... } - onChange : null, // function(value) { ... } - onItemAdd : null, // function(value, $item) { ... } - onItemRemove : null, // function(value) { ... } - onClear : null, // function() { ... } - onOptionAdd : null, // function(value, data) { ... } - onOptionRemove : null, // function(value) { ... } - onOptionClear : null, // function() { ... } - onDropdownOpen : null, // function($dropdown) { ... } - onDropdownClose : null, // function($dropdown) { ... } - onType : null, // function(str) { ... } - onDelete : null, // function(values) { ... } + load : null, // function(query, callback) { ... } + score : null, // function(search) { ... } + onInitialize : null, // function() { ... } + onChange : null, // function(value) { ... } + onItemAdd : null, // function(value, $item) { ... } + onItemRemove : null, // function(value) { ... } + onClear : null, // function() { ... } + onOptionAdd : null, // function(value, data) { ... } + onOptionRemove : null, // function(value) { ... } + onOptionClear : null, // function() { ... } + onOptionGroupAdd : null, // function(id, data) { ... } + onOptionGroupRemove : null, // function(id) { ... } + onOptionGroupClear : null, // function() { ... } + onDropdownOpen : null, // function($dropdown) { ... } + onDropdownClose : null, // function($dropdown) { ... } + onType : null, // function(str) { ... } + onDelete : null, // function(values) { ... } */ render: { @@ -2932,6 +3238,7 @@ } }; + $.fn.selectize = function(settings_user) { var defaults = $.fn.selectize.defaults; var settings = $.extend({}, defaults, settings_user); @@ -2949,19 +3256,27 @@ * @param {object} settings_element */ var init_textbox = function($input, settings_element) { - var i, n, values, option, value = $.trim($input.val() || ''); - if (!value.length) return; + var i, n, values, option; - values = value.split(settings.delimiter); - for (i = 0, n = values.length; i < n; i++) { - option = {}; - option[field_label] = values[i]; - option[field_value] = values[i]; + var data_raw = $input.attr(attr_data); - settings_element.options[values[i]] = option; + if (!data_raw) { + var value = $.trim($input.val() || ''); + if (!settings.allowEmptyOption && !value.length) return; + values = value.split(settings.delimiter); + for (i = 0, n = values.length; i < n; i++) { + option = {}; + option[field_label] = values[i]; + option[field_value] = values[i]; + settings_element.options.push(option); + } + settings_element.items = values; + } else { + settings_element.options = JSON.parse(data_raw); + for (i = 0, n = settings_element.options.length; i < n; i++) { + settings_element.items.push(settings_element.options[i][field_value]); + } } - - settings_element.items = values; }; /** @@ -2973,6 +3288,7 @@ var init_select = function($input, settings_element) { var i, n, tagName, $children, order = 0; var options = settings_element.options; + var optionsMap = {}; var readData = function($el) { var data = attr_data && $el.attr(attr_data); @@ -2983,37 +3299,36 @@ }; var addOption = function($option, group) { - var value, option; - $option = $($option); - value = $option.attr('value') || ''; - if (!value.length) return; + var value = hash_key($option.attr('value')); + if (!value && !settings.allowEmptyOption) return; // if the option already exists, it's probably been // duplicated in another optgroup. in this case, push // the current group to the "optgroup" property on the // existing option so that it's rendered in both places. - if (options.hasOwnProperty(value)) { + if (optionsMap.hasOwnProperty(value)) { if (group) { - if (!options[value].optgroup) { - options[value].optgroup = group; - } else if (!$.isArray(options[value].optgroup)) { - options[value].optgroup = [options[value].optgroup, group]; + var arr = optionsMap[value][field_optgroup]; + if (!arr) { + optionsMap[value][field_optgroup] = group; + } else if (!$.isArray(arr)) { + optionsMap[value][field_optgroup] = [arr, group]; } else { - options[value].optgroup.push(group); + arr.push(group); } } return; } - option = readData($option) || {}; + var option = readData($option) || {}; option[field_label] = option[field_label] || $option.text(); option[field_value] = option[field_value] || value; option[field_optgroup] = option[field_optgroup] || group; - option.$order = ++order; - options[value] = option; + optionsMap[value] = option; + options.push(option); if ($option.is(':selected')) { settings_element.items.push(value); @@ -3030,7 +3345,7 @@ optgroup = readData($optgroup) || {}; optgroup[field_optgroup_label] = id; optgroup[field_optgroup_value] = id; - settings_element.optgroups[id] = optgroup; + settings_element.optgroups.push(optgroup); } $options = $('option', $optgroup); @@ -3058,10 +3373,15 @@ var instance; var $input = $(this); var tag_name = this.tagName.toLowerCase(); + var placeholder = $input.attr('placeholder') || $input.attr('data-placeholder'); + if (!placeholder && !settings.allowEmptyOption) { + placeholder = $input.children('option[value=""]').text(); + } + var settings_element = { - 'placeholder' : $input.children('option[value=""]').text() || $input.attr('placeholder'), - 'options' : {}, - 'optgroups' : {}, + 'placeholder' : placeholder, + 'options' : [], + 'optgroups' : [], 'items' : [] }; @@ -3072,12 +3392,14 @@ } instance = new Selectize($input, $.extend(true, {}, defaults, settings_element, settings_user)); - $input.data('selectize', instance); - $input.addClass('selectized'); }); }; $.fn.selectize.defaults = Selectize.defaults; + $.fn.selectize.support = { + validity: SUPPORTS_VALIDITY_API + }; + Selectize.define('drag_drop', function(options) { if (!$.fn.sortable) throw new Error('The "drag_drop" plugin requires jQuery UI "sortable".'); @@ -3207,6 +3529,22 @@ }; })(); + var getScrollbarWidth = function() { + var div; + var width = getScrollbarWidth.width; + var doc = document; + + if (typeof width === 'undefined') { + div = doc.createElement('div'); + div.innerHTML = '
    '; + div = div.firstChild; + doc.body.appendChild(div); + width = getScrollbarWidth.width = div.offsetWidth - div.clientWidth; + doc.body.removeChild(div); + } + return width; + }; + var equalizeSizes = function() { var i, n, height_max, width, width_last, width_parent, $optgroups; @@ -3223,7 +3561,7 @@ } if (options.equalizeWidth) { - width_parent = self.$dropdown_content.innerWidth(); + width_parent = self.$dropdown_content.innerWidth() - getScrollbarWidth(); width = Math.round(width_parent / n); $optgroups.css({width: width}); if (n > 1) { @@ -3284,7 +3622,7 @@ e.preventDefault(); if (self.isLocked) return; - var $item = $(e.target).parent(); + var $item = $(e.currentTarget).parent(); self.setActiveItem($item); if (self.deleteSelection()) { self.setCaret(self.items.length); @@ -3303,7 +3641,7 @@ return option[this.settings.labelField]; }; - this.onKeyDown = (function(e) { + this.onKeyDown = (function() { var original = self.onKeyDown; return function(e) { var index, option; @@ -3323,6 +3661,7 @@ }; })(); }); + return Selectize; })); \ No newline at end of file diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.legacy.css b/xadmin/static/xadmin/vendor/selectize/selectize.legacy.css index fa85c09bf..0dccdb6cc 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.legacy.css +++ b/xadmin/static/xadmin/vendor/selectize/selectize.legacy.css @@ -1,6 +1,6 @@ /** - * selectize.legacy.css (v0.8.4) - Default Theme - * Copyright (c) 2013 Brian Reavis & contributors + * selectize.legacy.css (v0.12.1) - Default Theme + * Copyright (c) 2013–2015 Brian Reavis & contributors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this * file except in compliance with the License. You may obtain a copy of the License at: @@ -13,354 +13,312 @@ * * @author Brian Reavis */ - .selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder { + visibility: visible !important; background: #f2f2f2 !important; background: rgba(0, 0, 0, 0.06) !important; border: 0 none !important; - visibility: visible !important; -webkit-box-shadow: inset 0 0 12px 4px #ffffff; - box-shadow: inset 0 0 12px 4px #ffffff; + box-shadow: inset 0 0 12px 4px #ffffff; } - .selectize-control.plugin-drag_drop .ui-sortable-placeholder::after { content: '!'; visibility: hidden; } - .selectize-control.plugin-drag_drop .ui-sortable-helper { -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); } - .selectize-dropdown-header { position: relative; padding: 7px 10px; - background: #f8f8f8; border-bottom: 1px solid #d0d0d0; + background: #f8f8f8; -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-dropdown-header-close { position: absolute; - top: 50%; right: 10px; - margin-top: -12px; - font-size: 20px !important; - line-height: 20px; + top: 50%; color: #303030; opacity: 0.4; + margin-top: -12px; + line-height: 20px; + font-size: 20px !important; } - .selectize-dropdown-header-close:hover { color: #000000; } - .selectize-dropdown.plugin-optgroup_columns .optgroup { - float: left; - border-top: 0 none; border-right: 1px solid #f2f2f2; + border-top: 0 none; + float: left; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:last-child { border-right: 0 none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup:before { display: none; } - .selectize-dropdown.plugin-optgroup_columns .optgroup-header { border-top: 0 none; } - .selectize-control.plugin-remove_button [data-value] { position: relative; padding-right: 24px !important; } - .selectize-control.plugin-remove_button [data-value] .remove { + z-index: 1; + /* fixes ie bug (see #392) */ position: absolute; top: 0; right: 0; bottom: 0; - display: inline-block; width: 17px; - padding: 1px 0 0 0; - font-size: 12px; + text-align: center; font-weight: bold; + font-size: 12px; color: inherit; - text-align: center; text-decoration: none; vertical-align: middle; + display: inline-block; + padding: 1px 0 0 0; border-left: 1px solid #74b21e; -webkit-border-radius: 0 2px 2px 0; - -moz-border-radius: 0 2px 2px 0; - border-radius: 0 2px 2px 0; + -moz-border-radius: 0 2px 2px 0; + border-radius: 0 2px 2px 0; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } - .selectize-control.plugin-remove_button [data-value] .remove:hover { background: rgba(0, 0, 0, 0.05); } - .selectize-control.plugin-remove_button [data-value].active .remove { border-left-color: #6f9839; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove:hover { background: none; } - .selectize-control.plugin-remove_button .disabled [data-value] .remove { border-left-color: #b4b4b4; } - .selectize-control { position: relative; } - .selectize-dropdown, .selectize-input, .selectize-input input { + color: #303030; font-family: inherit; font-size: 13px; - -webkit-font-smoothing: inherit; line-height: 20px; - color: #303030; + -webkit-font-smoothing: inherit; } - .selectize-input, .selectize-control.single .selectize-input.input-active { - display: inline-block; - cursor: text; background: #ffffff; + cursor: text; + display: inline-block; } - .selectize-input { - position: relative; - z-index: 1; + border: 1px solid #d0d0d0; + padding: 10px 10px; display: inline-block; width: 100%; - padding: 10px 10px; overflow: hidden; - border: 1px solid #d0d0d0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + position: relative; + z-index: 1; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } - .selectize-control.multi .selectize-input.has-items { padding: 8px 10px 4px; } - .selectize-input.full { background-color: #f2f2f2; } - .selectize-input.disabled, .selectize-input.disabled * { cursor: default !important; } - .selectize-input.focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15); } - .selectize-input.dropdown-active { -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } - .selectize-input > * { + vertical-align: baseline; display: -moz-inline-stack; display: inline-block; - *display: inline; - vertical-align: baseline; zoom: 1; + *display: inline; } - .selectize-control.multi .selectize-input > div { - padding: 1px 5px; - margin: 0 4px 4px 0; - color: #3d5d18; cursor: pointer; + margin: 0 4px 4px 0; + padding: 1px 5px; background: #b8e76f; + color: #3d5d18; border: 1px solid #74b21e; } - .selectize-control.multi .selectize-input > div.active { - color: #303030; background: #92c836; + color: #303030; border: 1px solid #6f9839; } - .selectize-control.multi .selectize-input.disabled > div, .selectize-control.multi .selectize-input.disabled > div.active { color: #878787; background: #f8f8f8; border: 1px solid #b4b4b4; } - .selectize-input > input { - max-width: 100% !important; - max-height: none !important; - min-height: 0 !important; + display: inline-block !important; padding: 0 !important; + min-height: 0 !important; + max-height: none !important; + max-width: 100% !important; margin: 0 2px 0 0 !important; - line-height: inherit !important; text-indent: 0 !important; - background: none !important; border: 0 none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + background: none !important; + line-height: inherit !important; -webkit-user-select: auto !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} +.selectize-input > input::-ms-clear { + display: none; } - .selectize-input > input:focus { outline: none !important; } - .selectize-input::after { + content: ' '; display: block; clear: left; - content: ' '; } - .selectize-input.dropdown-active::before { + content: ' '; + display: block; position: absolute; - right: 0; + background: #f0f0f0; + height: 1px; bottom: 0; left: 0; - display: block; - height: 1px; - background: #f0f0f0; - content: ' '; + right: 0; } - .selectize-dropdown { position: absolute; z-index: 10; - margin: -1px 0 0 0; - background: #ffffff; border: 1px solid #d0d0d0; + background: #ffffff; + margin: -1px 0 0 0; border-top: 0 none; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } - .selectize-dropdown [data-selectable] { - overflow: hidden; cursor: pointer; + overflow: hidden; } - .selectize-dropdown [data-selectable] .highlight { background: rgba(255, 237, 40, 0.4); -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; } - .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header { padding: 7px 10px; } - .selectize-dropdown .optgroup:first-child .optgroup-header { border-top: 0 none; } - .selectize-dropdown .optgroup-header { color: #303030; - cursor: default; background: #f8f8f8; + cursor: default; } - .selectize-dropdown .active { - color: #303030; background-color: #fffceb; + color: #303030; } - .selectize-dropdown .active.create { color: #303030; } - .selectize-dropdown .create { color: rgba(48, 48, 48, 0.5); } - .selectize-dropdown-content { - max-height: 200px; - overflow-x: hidden; overflow-y: auto; + overflow-x: hidden; + max-height: 200px; } - .selectize-control.single .selectize-input, .selectize-control.single .selectize-input input { cursor: pointer; } - .selectize-control.single .selectize-input.input-active, .selectize-control.single .selectize-input.input-active input { cursor: text; } - .selectize-control.single .selectize-input:after { + content: ' '; + display: block; position: absolute; top: 50%; right: 15px; - display: block; + margin-top: -3px; width: 0; height: 0; - margin-top: -3px; - border-color: #808080 transparent transparent transparent; border-style: solid; border-width: 5px 5px 0 5px; - content: ' '; + border-color: #808080 transparent transparent transparent; } - .selectize-control.single .selectize-input.dropdown-active:after { margin-top: -4px; - border-color: transparent transparent #808080 transparent; border-width: 0 5px 5px 5px; + border-color: transparent transparent #808080 transparent; } - .selectize-control.rtl.single .selectize-input:after { - right: auto; left: 15px; + right: auto; } - .selectize-control.rtl .selectize-input > input { margin: 0 4px 0 -2px !important; } - .selectize-control .selectize-input.disabled { - background-color: #fafafa; opacity: 0.5; + background-color: #fafafa; } - .selectize-control.multi .selectize-input [data-value] { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; background-color: #b2e567; background-image: -moz-linear-gradient(top, #b8e76f, #a9e25c); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b8e76f), to(#a9e25c)); @@ -368,14 +326,10 @@ background-image: -o-linear-gradient(top, #b8e76f, #a9e25c); background-image: linear-gradient(to bottom, #b8e76f, #a9e25c); background-repeat: repeat-x; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb8e76f', endColorstr='#ffa9e25c', GradientType=0); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); } - .selectize-control.multi .selectize-input [data-value].active { background-color: #88c332; background-image: -moz-linear-gradient(top, #92c836, #7abc2c); @@ -386,8 +340,9 @@ background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff92c836', endColorstr='#ff7abc2c', GradientType=0); } - .selectize-control.single .selectize-input { + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.8), 0 2px 0 #e0e0e0, 0 3px 0 #c8c8c8, 0 4px 1px rgba(0,0,0,0.1); + box-shadow: inset 0 1px 0 rgba(255,255,255,0.8), 0 2px 0 #e0e0e0, 0 3px 0 #c8c8c8, 0 4px 1px rgba(0,0,0,0.1); background-color: #f3f3f3; background-image: -moz-linear-gradient(top, #f5f5f5, #efefef); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#efefef)); @@ -396,18 +351,14 @@ background-image: linear-gradient(to bottom, #f5f5f5, #efefef); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffefefef', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), 0 2px 0 #e0e0e0, 0 3px 0 #c8c8c8, 0 4px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), 0 2px 0 #e0e0e0, 0 3px 0 #c8c8c8, 0 4px 1px rgba(0, 0, 0, 0.1); } - .selectize-control.single .selectize-input, .selectize-dropdown.single { border-color: #b8b8b8; } - .selectize-dropdown .optgroup-header { - font-size: 0.8em; font-weight: bold; - border-top: 1px solid #f0f0f0; + font-size: 0.8em; border-bottom: 1px solid #f0f0f0; -} \ No newline at end of file + border-top: 1px solid #f0f0f0; +} diff --git a/xadmin/static/xadmin/vendor/selectize/selectize.min.js b/xadmin/static/xadmin/vendor/selectize/selectize.min.js index 622fcacc3..fe955bc00 100644 --- a/xadmin/static/xadmin/vendor/selectize/selectize.min.js +++ b/xadmin/static/xadmin/vendor/selectize/selectize.min.js @@ -1,3 +1,3 @@ -/*! selectize.js - v0.8.4 | https://github.com/brianreavis/selectize.js | Apache License (v2) */ -!function(a,b){"function"==typeof define&&define.amd?define(b):"object"==typeof exports?module.exports=b():a.Sifter=b()}(this,function(){var a=function(a,b){this.items=a,this.settings=b||{diacritics:!0}};a.prototype.tokenize=function(a){if(a=d(String(a||"").toLowerCase()),!a||!a.length)return[];var b,c,f,h,i=[],j=a.split(/ +/);for(b=0,c=j.length;c>b;b++){if(f=e(j[b]),this.settings.diacritics)for(h in g)g.hasOwnProperty(h)&&(f=f.replace(new RegExp(h,"g"),g[h]));i.push({string:j[b],regex:new RegExp(f,"i")})}return i},a.prototype.iterator=function(a,b){var c;c=f(a)?Array.prototype.forEach||function(a){for(var b=0,c=this.length;c>b;b++)a(this[b],b,this)}:function(a){for(var b in this)this.hasOwnProperty(b)&&a(this[b],b,this)},c.apply(a,[b])},a.prototype.getScoreFunction=function(a,b){var c,d,e,f;c=this,a=c.prepareSearch(a,b),e=a.tokens,d=a.options.fields,f=e.length;var g=function(a,b){var c,d;return a?(a=String(a||""),d=a.search(b.regex),-1===d?0:(c=b.string.length/a.length,0===d&&(c+=.5),c)):0},h=function(){var a=d.length;return a?1===a?function(a,b){return g(b[d[0]],a)}:function(b,c){for(var e=0,f=0;a>e;e++)f+=g(c[d[e]],b);return f/a}:function(){return 0}}();return f?1===f?function(a){return h(e[0],a)}:"and"===a.options.conjunction?function(a){for(var b,c=0,d=0;f>c;c++){if(b=h(e[c],a),0>=b)return 0;d+=b}return d/f}:function(a){for(var b=0,c=0;f>b;b++)c+=h(e[b],a);return c/f}:function(){return 0}},a.prototype.getSortFunction=function(a,c){var d,e,f,g,h,i,j,k,l,m,n;if(f=this,a=f.prepareSearch(a,c),n=!a.query&&c.sort_empty||c.sort,l=function(a,b){return"$score"===a?b.score:f.items[b.id][a]},h=[],n)for(d=0,e=n.length;e>d;d++)(a.query||"$score"!==n[d].field)&&h.push(n[d]);if(a.query){for(m=!0,d=0,e=h.length;e>d;d++)if("$score"===h[d].field){m=!1;break}m&&h.unshift({field:"$score",direction:"desc"})}else for(d=0,e=h.length;e>d;d++)if("$score"===h[d].field){h.splice(d,1);break}for(k=[],d=0,e=h.length;e>d;d++)k.push("desc"===h[d].direction?-1:1);return i=h.length,i?1===i?(g=h[0].field,j=k[0],function(a,c){return j*b(l(g,a),l(g,c))}):function(a,c){var d,e,f;for(d=0;i>d;d++)if(f=h[d].field,e=k[d]*b(l(f,a),l(f,c)))return e;return 0}:null},a.prototype.prepareSearch=function(a,b){if("object"==typeof a)return a;b=c({},b);var d=b.fields,e=b.sort,g=b.sort_empty;return d&&!f(d)&&(b.fields=[d]),e&&!f(e)&&(b.sort=[e]),g&&!f(g)&&(b.sort_empty=[g]),{options:b,query:String(a||"").toLowerCase(),tokens:this.tokenize(a),total:0,items:[]}},a.prototype.search=function(a,b){var c,d,e,f,g=this;return d=this.prepareSearch(a,b),b=d.options,a=d.query,f=b.score||g.getScoreFunction(d),a.length?g.iterator(g.items,function(a,e){c=f(a),(b.filter===!1||c>0)&&d.items.push({score:c,id:e})}):g.iterator(g.items,function(a,b){d.items.push({score:1,id:b})}),e=g.getSortFunction(d,b),e&&d.items.sort(e),d.total=d.items.length,"number"==typeof b.limit&&(d.items=d.items.slice(0,b.limit)),d};var b=function(a,b){return"number"==typeof a&&"number"==typeof b?a>b?1:b>a?-1:0:(a=String(a||"").toLowerCase(),b=String(b||"").toLowerCase(),a>b?1:b>a?-1:0)},c=function(a){var b,c,d,e;for(b=1,c=arguments.length;c>b;b++)if(e=arguments[b])for(d in e)e.hasOwnProperty(d)&&(a[d]=e[d]);return a},d=function(a){return(a+"").replace(/^\s+|\s+$|/g,"")},e=function(a){return(a+"").replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")},f=Array.isArray||$&&$.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)},g={a:"[aÀÁÂÃÄÅàáâãäå]",c:"[cÇçćĆčČ]",d:"[dđĐ]",e:"[eÈÉÊËèéêë]",i:"[iÌÍÎÏìíîï]",n:"[nÑñ]",o:"[oÒÓÔÕÕÖØòóôõöø]",s:"[sŠš]",u:"[uÙÚÛÜùúûü]",y:"[yŸÿý]",z:"[zŽž]"};return a}),function(a,b){"function"==typeof define&&define.amd?define(b):"object"==typeof exports?module.exports=b():a.MicroPlugin=b()}(this,function(){var a={};a.mixin=function(a){a.plugins={},a.prototype.initializePlugins=function(a){var c,d,e,f=this,g=[];if(f.plugins={names:[],settings:{},requested:{},loaded:{}},b.isArray(a))for(c=0,d=a.length;d>c;c++)"string"==typeof a[c]?g.push(a[c]):(f.plugins.settings[a[c].name]=a[c].options,g.push(a[c].name));else if(a)for(e in a)a.hasOwnProperty(e)&&(f.plugins.settings[e]=a[e],g.push(e));for(;g.length;)f.require(g.shift())},a.prototype.loadPlugin=function(b){var c=this,d=c.plugins,e=a.plugins[b];if(!a.plugins.hasOwnProperty(b))throw new Error('Unable to find "'+b+'" plugin');d.requested[b]=!0,d.loaded[b]=e.fn.apply(c,[c.plugins.settings[b]||{}]),d.names.push(b)},a.prototype.require=function(a){var b=this,c=b.plugins;if(!b.plugins.loaded.hasOwnProperty(a)){if(c.requested[a])throw new Error('Plugin has circular dependency ("'+a+'")');b.loadPlugin(a)}return c.loaded[a]},a.define=function(b,c){a.plugins[b]={name:b,fn:c}}};var b={isArray:Array.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)}};return a}),function(a,b){"function"==typeof define&&define.amd?define(["jquery","sifter","microplugin"],b):a.Selectize=b(a.jQuery,a.Sifter,a.MicroPlugin)}(this,function(a,b,c){"use strict";var d=function(a,b){if("string"!=typeof b||b.length){var c="string"==typeof b?new RegExp(b,"i"):b,d=function(a){var b=0;if(3===a.nodeType){var e=a.data.search(c);if(e>=0&&a.data.length>0){var f=a.data.match(c),g=document.createElement("span");g.className="highlight";var h=a.splitText(e);h.splitText(f[0].length);var i=h.cloneNode(!0);g.appendChild(i),h.parentNode.replaceChild(g,h),b=1}}else if(1===a.nodeType&&a.childNodes&&!/(script|style)/i.test(a.tagName))for(var j=0;j/g,">").replace(/"/g,""")},y=function(a){return(a+"").replace(/\$/g,"$$$$")},z={};z.before=function(a,b,c){var d=a[b];a[b]=function(){return c.apply(a,arguments),d.apply(a,arguments)}},z.after=function(a,b,c){var d=a[b];a[b]=function(){var b=d.apply(a,arguments);return c.apply(a,arguments),b}};var A=function(b,c){if(!a.isArray(c))return c;var d,e,f={};for(d=0,e=c.length;e>d;d++)c[d].hasOwnProperty(b)&&(f[c[d][b]]=c[d]);return f},B=function(a){var b=!1;return function(){b||(b=!0,a.apply(this,arguments))}},C=function(a,b){var c;return function(){var d=this,e=arguments;window.clearTimeout(c),c=window.setTimeout(function(){a.apply(d,e)},b)}},D=function(a,b,c){var d,e=a.trigger,f={};a.trigger=function(){var c=arguments[0];return-1===b.indexOf(c)?e.apply(a,arguments):(f[c]=arguments,void 0)},c.apply(a,[]),a.trigger=e;for(d in f)f.hasOwnProperty(d)&&e.apply(a,f[d])},E=function(a,b,c,d){a.on(b,c,function(b){for(var c=b.target;c&&c.parentNode!==a[0];)c=c.parentNode;return b.currentTarget=c,d.apply(this,[b])})},F=function(a){var b={};if("selectionStart"in a)b.start=a.selectionStart,b.length=a.selectionEnd-b.start;else if(document.selection){a.focus();var c=document.selection.createRange(),d=document.selection.createRange().text.length;c.moveStart("character",-a.value.length),b.start=c.text.length-d,b.length=d}return b},G=function(a,b,c){var d,e,f={};if(c)for(d=0,e=c.length;e>d;d++)f[c[d]]=a.css(c[d]);else f=a.css();b.css(f)},H=function(b,c){var d=a("").css({position:"absolute",top:-99999,left:-99999,width:"auto",padding:0,whiteSpace:"pre"}).text(b).appendTo("body");G(c,d,["letterSpacing","fontSize","fontFamily","fontWeight","textTransform"]);var e=d.width();return d.remove(),e},I=function(a){var b=function(b){var c,d,e,f,g,h,i,j;b=b||window.event||{},b.metaKey||b.altKey||a.data("grow")!==!1&&(c=a.val(),b.type&&"keydown"===b.type.toLowerCase()&&(d=b.keyCode,e=d>=97&&122>=d||d>=65&&90>=d||d>=48&&57>=d||32===d,d===o||d===n?(j=F(a[0]),j.length?c=c.substring(0,j.start)+c.substring(j.start+j.length):d===n&&j.start?c=c.substring(0,j.start-1)+c.substring(j.start+1):d===o&&"undefined"!=typeof j.start&&(c=c.substring(0,j.start)+c.substring(j.start+1))):e&&(h=b.shiftKey,i=String.fromCharCode(b.keyCode),i=h?i.toUpperCase():i.toLowerCase(),c+=i)),f=a.attr("placeholder")||"",!c.length&&f.length&&(c=f),g=H(c,a)+4,g!==a.width()&&(a.width(g),a.triggerHandler("resize")))};a.on("keydown keyup update blur",b),b()},J=function(c,d){var e,f,g=this;f=c[0],f.selectize=g,e=window.getComputedStyle?window.getComputedStyle(f,null).getPropertyValue("direction"):f.currentStyle&&f.currentStyle.direction,e=e||c.parents("[dir]:first").attr("dir")||"",a.extend(g,{settings:d,$input:c,tagType:"select"===f.tagName.toLowerCase()?t:u,rtl:/rtl/i.test(e),eventNS:".selectize"+ ++J.count,highlightedValue:null,isOpen:!1,isDisabled:!1,isRequired:c.is("[required]"),isInvalid:!1,isLocked:!1,isFocused:!1,isInputHidden:!1,isSetup:!1,isShiftDown:!1,isCmdDown:!1,isCtrlDown:!1,ignoreFocus:!1,ignoreHover:!1,hasOptions:!1,currentResults:null,lastValue:"",caretPos:0,loading:0,loadedSearches:{},$activeOption:null,$activeItems:[],optgroups:{},options:{},userOptions:{},items:[],renderCache:{},onSearchChange:C(g.onSearchChange,d.loadThrottle)}),g.sifter=new b(this.options,{diacritics:d.diacritics}),a.extend(g.options,A(d.valueField,d.options)),delete g.settings.options,a.extend(g.optgroups,A(d.optgroupValueField,d.optgroups)),delete g.settings.optgroups,g.settings.mode=g.settings.mode||(1===g.settings.maxItems?"single":"multi"),"boolean"!=typeof g.settings.hideSelected&&(g.settings.hideSelected="multi"===g.settings.mode),g.initializePlugins(g.settings.plugins),g.setupCallbacks(),g.setupTemplates(),g.setup()};return e.mixin(J),c.mixin(J),a.extend(J.prototype,{setup:function(){var b,c,d,e,g,h,i,j,k,l,m=this,n=m.settings,o=m.eventNS,s=a(window),u=a(document);i=m.settings.mode,j=m.$input.attr("tabindex")||"",k=m.$input.attr("class")||"",b=a("
    ").addClass(n.wrapperClass).addClass(k).addClass(i),c=a("
    ").addClass(n.inputClass).addClass("items").appendTo(b),d=a('').appendTo(c).attr("tabindex",j),h=a(n.dropdownParent||b),e=a("
    ").addClass(n.dropdownClass).addClass(k).addClass(i).hide().appendTo(h),g=a("
    ").addClass(n.dropdownContentClass).appendTo(e),b.css({width:m.$input[0].style.width}),m.plugins.names.length&&(l="plugin-"+m.plugins.names.join(" plugin-"),b.addClass(l),e.addClass(l)),(null===n.maxItems||n.maxItems>1)&&m.tagType===t&&m.$input.attr("multiple","multiple"),m.settings.placeholder&&d.attr("placeholder",n.placeholder),m.$wrapper=b,m.$control=c,m.$control_input=d,m.$dropdown=e,m.$dropdown_content=g,e.on("mouseenter","[data-selectable]",function(){return m.onOptionHover.apply(m,arguments)}),e.on("mousedown","[data-selectable]",function(){return m.onOptionSelect.apply(m,arguments)}),E(c,"mousedown","*:not(input)",function(){return m.onItemSelect.apply(m,arguments)}),I(d),c.on({mousedown:function(){return m.onMouseDown.apply(m,arguments)},click:function(){return m.onClick.apply(m,arguments)}}),d.on({mousedown:function(a){a.stopPropagation()},keydown:function(){return m.onKeyDown.apply(m,arguments)},keyup:function(){return m.onKeyUp.apply(m,arguments)},keypress:function(){return m.onKeyPress.apply(m,arguments)},resize:function(){m.positionDropdown.apply(m,[])},blur:function(){return m.onBlur.apply(m,arguments)},focus:function(){return m.onFocus.apply(m,arguments)}}),u.on("keydown"+o,function(a){m.isCmdDown=a[f?"metaKey":"ctrlKey"],m.isCtrlDown=a[f?"altKey":"ctrlKey"],m.isShiftDown=a.shiftKey}),u.on("keyup"+o,function(a){a.keyCode===r&&(m.isCtrlDown=!1),a.keyCode===p&&(m.isShiftDown=!1),a.keyCode===q&&(m.isCmdDown=!1)}),u.on("mousedown"+o,function(a){if(m.isFocused){if(a.target===m.$dropdown[0]||a.target.parentNode===m.$dropdown[0])return!1;m.$control.has(a.target).length||a.target===m.$control[0]||m.blur()}}),s.on(["scroll"+o,"resize"+o].join(" "),function(){m.isOpen&&m.positionDropdown.apply(m,arguments)}),s.on("mousemove"+o,function(){m.ignoreHover=!1}),this.revertSettings={$children:m.$input.children().detach(),tabindex:m.$input.attr("tabindex")},m.$input.attr("tabindex",-1).hide().after(m.$wrapper),a.isArray(n.items)&&(m.setValue(n.items),delete n.items),m.$input[0].validity&&m.$input.on("invalid"+o,function(a){a.preventDefault(),m.isInvalid=!0,m.refreshState()}),m.updateOriginalInput(),m.refreshItems(),m.refreshState(),m.updatePlaceholder(),m.isSetup=!0,m.$input.is(":disabled")&&m.disable(),m.on("change",this.onChange),m.trigger("initialize"),n.preload&&m.onSearchChange("")},setupTemplates:function(){var b=this,c=b.settings.labelField,d=b.settings.optgroupLabelField,e={optgroup:function(a){return'
    '+a.html+"
    "},optgroup_header:function(a,b){return'
    '+b(a[d])+"
    "},option:function(a,b){return'
    '+b(a[c])+"
    "},item:function(a,b){return'
    '+b(a[c])+"
    "},option_create:function(a,b){return'
    Add '+b(a.input)+"…
    "}};b.settings.render=a.extend({},e,b.settings.render)},setupCallbacks:function(){var a,b,c={initialize:"onInitialize",change:"onChange",item_add:"onItemAdd",item_remove:"onItemRemove",clear:"onClear",option_add:"onOptionAdd",option_remove:"onOptionRemove",option_clear:"onOptionClear",dropdown_open:"onDropdownOpen",dropdown_close:"onDropdownClose",type:"onType"};for(a in c)c.hasOwnProperty(a)&&(b=this.settings[c[a]],b&&this.on(a,b))},onClick:function(a){var b=this;b.isFocused||(b.focus(),a.preventDefault())},onMouseDown:function(b){var c=this,d=b.isDefaultPrevented();if(a(b.target),c.isFocused){if(b.target!==c.$control_input[0])return"single"===c.settings.mode?c.isOpen?c.close():c.open():d||c.setActiveItem(null),!1}else d||window.setTimeout(function(){c.focus()},0)},onChange:function(){this.$input.trigger("change")},onKeyPress:function(a){if(this.isLocked)return a&&a.preventDefault();var b=String.fromCharCode(a.keyCode||a.which);return this.settings.create&&b===this.settings.delimiter?(this.createItem(),a.preventDefault(),!1):void 0},onKeyDown:function(a){a.target===this.$control_input[0];var b=this;if(b.isLocked)return a.keyCode!==s&&a.preventDefault(),void 0;switch(a.keyCode){case g:if(b.isCmdDown)return b.selectAll(),void 0;break;case i:return b.close(),void 0;case m:if(!b.isOpen&&b.hasOptions)b.open();else if(b.$activeOption){b.ignoreHover=!0;var c=b.getAdjacentOption(b.$activeOption,1);c.length&&b.setActiveOption(c,!0,!0)}return a.preventDefault(),void 0;case k:if(b.$activeOption){b.ignoreHover=!0;var d=b.getAdjacentOption(b.$activeOption,-1);d.length&&b.setActiveOption(d,!0,!0)}return a.preventDefault(),void 0;case h:return b.isOpen&&b.$activeOption&&b.onOptionSelect({currentTarget:b.$activeOption}),a.preventDefault(),void 0;case j:return b.advanceSelection(-1,a),void 0;case l:return b.advanceSelection(1,a),void 0;case s:return b.settings.create&&b.createItem()&&a.preventDefault(),void 0;case n:case o:return b.deleteSelection(a),void 0}return b.isFull()||b.isInputHidden?(a.preventDefault(),void 0):void 0},onKeyUp:function(a){var b=this;if(b.isLocked)return a&&a.preventDefault();var c=b.$control_input.val()||"";b.lastValue!==c&&(b.lastValue=c,b.onSearchChange(c),b.refreshOptions(),b.trigger("type",c))},onSearchChange:function(a){var b=this,c=b.settings.load;c&&(b.loadedSearches.hasOwnProperty(a)||(b.loadedSearches[a]=!0,b.load(function(d){c.apply(b,[a,d])})))},onFocus:function(a){var b=this;return b.isFocused=!0,b.isDisabled?(b.blur(),a&&a.preventDefault(),!1):(b.ignoreFocus||("focus"===b.settings.preload&&b.onSearchChange(""),b.$activeItems.length||(b.showInput(),b.setActiveItem(null),b.refreshOptions(!!b.settings.openOnFocus)),b.refreshState()),void 0)},onBlur:function(){var a=this;a.isFocused=!1,a.ignoreFocus||(a.settings.create&&a.settings.createOnBlur&&a.createItem(),a.close(),a.setTextboxValue(""),a.setActiveItem(null),a.setActiveOption(null),a.setCaret(a.items.length),a.refreshState())},onOptionHover:function(a){this.ignoreHover||this.setActiveOption(a.currentTarget,!1)},onOptionSelect:function(b){var c,d,e=this;b.preventDefault&&(b.preventDefault(),b.stopPropagation()),d=a(b.currentTarget),d.hasClass("create")?e.createItem():(c=d.attr("data-value"),c&&(e.lastQuery=null,e.setTextboxValue(""),e.addItem(c),!e.settings.hideSelected&&b.type&&/mouse/.test(b.type)&&e.setActiveOption(e.getOption(c))))},onItemSelect:function(a){var b=this;b.isLocked||"multi"===b.settings.mode&&(a.preventDefault(),b.setActiveItem(a.currentTarget,a))},load:function(a){var b=this,c=b.$wrapper.addClass("loading");b.loading++,a.apply(b,[function(a){b.loading=Math.max(b.loading-1,0),a&&a.length&&(b.addOption(a),b.refreshOptions(b.isFocused&&!b.isInputHidden)),b.loading||c.removeClass("loading"),b.trigger("load",a)}])},setTextboxValue:function(a){this.$control_input.val(a).triggerHandler("update"),this.lastValue=a},getValue:function(){return this.tagType===t&&this.$input.attr("multiple")?this.items:this.items.join(this.settings.delimiter)},setValue:function(b){D(this,["change"],function(){this.clear();for(var c=a.isArray(b)?b:[b],d=0,e=c.length;e>d;d++)this.addItem(c[d])})},setActiveItem:function(b,c){var d,e,f,g,h,i,j,k,l=this;if("single"!==l.settings.mode){if(b=a(b),!b.length)return a(l.$activeItems).removeClass("active"),l.$activeItems=[],l.isFocused&&l.showInput(),void 0;if(d=c&&c.type.toLowerCase(),"mousedown"===d&&l.isShiftDown&&l.$activeItems.length){for(k=l.$control.children(".active:last"),g=Array.prototype.indexOf.apply(l.$control[0].childNodes,[k[0]]),h=Array.prototype.indexOf.apply(l.$control[0].childNodes,[b[0]]),g>h&&(j=g,g=h,h=j),e=g;h>=e;e++)i=l.$control[0].childNodes[e],-1===l.$activeItems.indexOf(i)&&(a(i).addClass("active"),l.$activeItems.push(i));c.preventDefault()}else"mousedown"===d&&l.isCtrlDown||"keydown"===d&&this.isShiftDown?b.hasClass("active")?(f=l.$activeItems.indexOf(b[0]),l.$activeItems.splice(f,1),b.removeClass("active")):l.$activeItems.push(b.addClass("active")[0]):(a(l.$activeItems).removeClass("active"),l.$activeItems=[b.addClass("active")[0]]);l.hideInput(),this.isFocused||l.focus()}},setActiveOption:function(b,c,d){var e,f,g,h,i,j=this;j.$activeOption&&j.$activeOption.removeClass("active"),j.$activeOption=null,b=a(b),b.length&&(j.$activeOption=b.addClass("active"),(c||!v(c))&&(e=j.$dropdown_content.height(),f=j.$activeOption.outerHeight(!0),c=j.$dropdown_content.scrollTop()||0,g=j.$activeOption.offset().top-j.$dropdown_content.offset().top+c,h=g,i=g-e+f,g+f>e+c?j.$dropdown_content.stop().animate({scrollTop:i},d?j.settings.scrollDuration:0):c>g&&j.$dropdown_content.stop().animate({scrollTop:h},d?j.settings.scrollDuration:0)))},selectAll:function(){this.$activeItems=Array.prototype.slice.apply(this.$control.children(":not(input)").addClass("active")),this.$activeItems.length&&(this.hideInput(),this.close()),this.focus()},hideInput:function(){var a=this;a.setTextboxValue(""),a.$control_input.css({opacity:0,position:"absolute",left:a.rtl?1e4:-1e4}),a.isInputHidden=!0},showInput:function(){this.$control_input.css({opacity:1,position:"relative",left:0}),this.isInputHidden=!1},focus:function(){var a=this;a.isDisabled||(a.ignoreFocus=!0,a.$control_input[0].focus(),window.setTimeout(function(){a.ignoreFocus=!1,a.onFocus()},0))},blur:function(){this.$control_input.trigger("blur")},getScoreFunction:function(a){return this.sifter.getScoreFunction(a,this.getSearchOptions())},getSearchOptions:function(){var a=this.settings,b=a.sortField;return"string"==typeof b&&(b={field:b}),{fields:a.searchField,conjunction:a.searchConjunction,sort:b}},search:function(b){var c,d,e,f=this,g=f.settings,h=this.getSearchOptions();if(g.score&&(e=f.settings.score.apply(this,[b]),"function"!=typeof e))throw new Error('Selectize "score" setting must be a function that returns a function');if(b!==f.lastQuery?(f.lastQuery=b,d=f.sifter.search(b,a.extend(h,{score:e})),f.currentResults=d):d=a.extend(!0,{},f.currentResults),g.hideSelected)for(c=d.items.length-1;c>=0;c--)-1!==f.items.indexOf(w(d.items[c].id))&&d.items.splice(c,1);return d},refreshOptions:function(b){var c,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s;"undefined"==typeof b&&(b=!0);var t=this,u=t.$control_input.val(),v=t.search(u),x=t.$dropdown_content,y=t.$activeOption&&w(t.$activeOption.attr("data-value"));if(g=v.items.length,"number"==typeof t.settings.maxOptions&&(g=Math.min(g,t.settings.maxOptions)),h={},t.settings.optgroupOrder)for(i=t.settings.optgroupOrder,c=0;cc;c++)for(j=t.options[v.items[c].id],k=t.render("option",j),l=j[t.settings.optgroupField]||"",m=a.isArray(l)?l:[l],e=0,f=m&&m.length;f>e;e++)l=m[e],t.optgroups.hasOwnProperty(l)||(l=""),h.hasOwnProperty(l)||(h[l]=[],i.push(l)),h[l].push(k);for(n=[],c=0,g=i.length;g>c;c++)l=i[c],t.optgroups.hasOwnProperty(l)&&h[l].length?(o=t.render("optgroup_header",t.optgroups[l])||"",o+=h[l].join(""),n.push(t.render("optgroup",a.extend({},t.optgroups[l],{html:o})))):n.push(h[l].join(""));if(x.html(n.join("")),t.settings.highlight&&v.query.length&&v.tokens.length)for(c=0,g=v.tokens.length;g>c;c++)d(x,v.tokens[c].regex);if(!t.settings.hideSelected)for(c=0,g=t.items.length;g>c;c++)t.getOption(t.items[c]).addClass("selected");p=t.settings.create&&v.query.length,p&&(x.prepend(t.render("option_create",{input:u})),s=a(x[0].childNodes[0])),t.hasOptions=v.items.length>0||p,t.hasOptions?(v.items.length>0?(r=y&&t.getOption(y),r&&r.length?q=r:"single"===t.settings.mode&&t.items.length&&(q=t.getOption(t.items[0])),q&&q.length||(q=s&&!t.settings.addPrecedence?t.getAdjacentOption(s,1):x.find("[data-selectable]:first"))):q=s,t.setActiveOption(q),b&&!t.isOpen&&t.open()):(t.setActiveOption(null),b&&t.isOpen&&t.close())},addOption:function(b){var c,d,e,f=this;if(a.isArray(b))for(c=0,d=b.length;d>c;c++)f.addOption(b[c]);else e=w(b[f.settings.valueField]),e&&!f.options.hasOwnProperty(e)&&(f.userOptions[e]=!0,f.options[e]=b,f.lastQuery=null,f.trigger("option_add",e,b))},addOptionGroup:function(a,b){this.optgroups[a]=b,this.trigger("optgroup_add",a,b)},updateOption:function(b,c){var d,e,f,g,h,i,j=this;if(b=w(b),f=w(c[j.settings.valueField]),j.options.hasOwnProperty(b)){if(!f)throw new Error("Value must be set in option data");f!==b&&(delete j.options[b],g=j.items.indexOf(b),-1!==g&&j.items.splice(g,1,f)),j.options[f]=c,h=j.renderCache.item,i=j.renderCache.option,v(h)&&(delete h[b],delete h[f]),v(i)&&(delete i[b],delete i[f]),-1!==j.items.indexOf(f)&&(d=j.getItem(b),e=a(j.render("item",c)),d.hasClass("active")&&e.addClass("active"),d.replaceWith(e)),j.isOpen&&j.refreshOptions(!1)}},removeOption:function(a){var b=this;a=w(a),delete b.userOptions[a],delete b.options[a],b.lastQuery=null,b.trigger("option_remove",a),b.removeItem(a)},clearOptions:function(){var a=this;a.loadedSearches={},a.userOptions={},a.options=a.sifter.items={},a.lastQuery=null,a.trigger("option_clear"),a.clear()},getOption:function(a){return this.getElementWithValue(a,this.$dropdown_content.find("[data-selectable]"))},getAdjacentOption:function(b,c){var d=this.$dropdown.find("[data-selectable]"),e=d.index(b)+c;return e>=0&&ed;d++)if(c[d].getAttribute("data-value")===b)return a(c[d]);return a()},getItem:function(a){return this.getElementWithValue(a,this.$control.children())},addItem:function(b){D(this,["change"],function(){var c,d,e,f,g=this,h=g.settings.mode;return b=w(b),-1!==g.items.indexOf(b)?("single"===h&&g.close(),void 0):(g.options.hasOwnProperty(b)&&("single"===h&&g.clear(),"multi"===h&&g.isFull()||(c=a(g.render("item",g.options[b])),g.items.splice(g.caretPos,0,b),g.insertAtCaret(c),g.refreshState(),g.isSetup&&(e=g.$dropdown_content.find("[data-selectable]"),d=g.getOption(b),f=g.getAdjacentOption(d,1).attr("data-value"),g.refreshOptions(g.isFocused&&"single"!==h),f&&g.setActiveOption(g.getOption(f)),!e.length||null!==g.settings.maxItems&&g.items.length>=g.settings.maxItems?g.close():g.positionDropdown(),g.updatePlaceholder(),g.trigger("item_add",b,c),g.updateOriginalInput()))),void 0)})},removeItem:function(a){var b,c,d,e=this;b="object"==typeof a?a:e.getItem(a),a=w(b.attr("data-value")),c=e.items.indexOf(a),-1!==c&&(b.remove(),b.hasClass("active")&&(d=e.$activeItems.indexOf(b[0]),e.$activeItems.splice(d,1)),e.items.splice(c,1),e.lastQuery=null,!e.settings.persist&&e.userOptions.hasOwnProperty(a)&&e.removeOption(a),c0),b.$control_input.data("grow",!c&&!d)},isFull:function(){return null!==this.settings.maxItems&&this.items.length>=this.settings.maxItems},updateOriginalInput:function(){var a,b,c,d=this;if("select"===d.$input[0].tagName.toLowerCase()){for(c=[],a=0,b=d.items.length;b>a;a++)c.push('');c.length||this.$input.attr("multiple")||c.push(''),d.$input.html(c.join(""))}else d.$input.val(d.getValue());d.isSetup&&d.trigger("change",d.$input.val())},updatePlaceholder:function(){if(this.settings.placeholder){var a=this.$control_input;this.items.length?a.removeAttr("placeholder"):a.attr("placeholder",this.settings.placeholder),a.triggerHandler("update")}},open:function(){var a=this;a.isLocked||a.isOpen||"multi"===a.settings.mode&&a.isFull()||(a.focus(),a.isOpen=!0,a.refreshState(),a.$dropdown.css({visibility:"hidden",display:"block"}),a.positionDropdown(),a.$dropdown.css({visibility:"visible"}),a.trigger("dropdown_open",a.$dropdown))},close:function(){var a=this,b=a.isOpen;"single"===a.settings.mode&&a.items.length&&a.hideInput(),a.isOpen=!1,a.$dropdown.hide(),a.setActiveOption(null),a.refreshState(),b&&a.trigger("dropdown_close",a.$dropdown)},positionDropdown:function(){var a=this.$control,b="body"===this.settings.dropdownParent?a.offset():a.position();b.top+=a.outerHeight(!0),this.$dropdown.css({width:a.outerWidth(),top:b.top,left:b.left})},clear:function(){var a=this;a.items.length&&(a.$control.children(":not(input)").remove(),a.items=[],a.setCaret(0),a.updatePlaceholder(),a.updateOriginalInput(),a.refreshState(),a.showInput(),a.trigger("clear"))},insertAtCaret:function(b){var c=Math.min(this.caretPos,this.items.length);0===c?this.$control.prepend(b):a(this.$control[0].childNodes[c]).before(b),this.setCaret(c+1)},deleteSelection:function(b){var c,d,e,f,g,h,i,j,k,l=this;if(e=b&&b.keyCode===n?-1:1,f=F(l.$control_input[0]),l.$activeOption&&!l.settings.hideSelected&&(i=l.getAdjacentOption(l.$activeOption,-1).attr("data-value")),g=[],l.$activeItems.length){for(k=l.$control.children(".active:"+(e>0?"last":"first")),h=l.$control.children(":not(input)").index(k),e>0&&h++,c=0,d=l.$activeItems.length;d>c;c++)g.push(a(l.$activeItems[c]).attr("data-value"));b&&(b.preventDefault(),b.stopPropagation())}else(l.isFocused||"single"===l.settings.mode)&&l.items.length&&(0>e&&0===f.start&&0===f.length?g.push(l.items[l.caretPos-1]):e>0&&f.start===l.$control_input.val().length&&g.push(l.items[l.caretPos]));if(!g.length||"function"==typeof l.settings.onDelete&&l.settings.onDelete.apply(l,[g])===!1)return!1;for("undefined"!=typeof h&&l.setCaret(h);g.length;)l.removeItem(g.pop());return l.showInput(),l.refreshOptions(!0),i&&(j=l.getOption(i),j.length&&l.setActiveOption(j)),!0},advanceSelection:function(a,b){var c,d,e,f,g,h,i=this;0!==a&&(i.rtl&&(a*=-1),c=a>0?"last":"first",d=F(i.$control_input[0]),i.isFocused&&!i.isInputHidden?(f=i.$control_input.val().length,g=0>a?0===d.start&&0===d.length:d.start===f,g&&!f&&i.advanceCaret(a,b)):(h=i.$control.children(".active:"+c),h.length&&(e=i.$control.children(":not(input)").index(h),i.setActiveItem(null),i.setCaret(a>0?e+1:e))))},advanceCaret:function(a,b){var c,d,e=this;0!==a&&(c=a>0?"next":"prev",e.isShiftDown?(d=e.$control_input[c](),d.length&&(e.hideInput(),e.setActiveItem(d),b&&b.preventDefault())):e.setCaret(e.caretPos+a))},setCaret:function(b){var c=this;b="single"===c.settings.mode?c.items.length:Math.max(0,Math.min(c.items.length,b));var d,e,f,g;for(f=c.$control.children(":not(input)"),d=0,e=f.length;e>d;d++)g=a(f[d]).detach(),b>d?c.$control_input.before(g):c.$control.append(g);c.caretPos=b},lock:function(){this.close(),this.isLocked=!0,this.refreshState()},unlock:function(){this.isLocked=!1,this.refreshState()},disable:function(){var a=this;a.$input.prop("disabled",!0),a.isDisabled=!0,a.lock()},enable:function(){var a=this;a.$input.prop("disabled",!1),a.isDisabled=!1,a.unlock()},destroy:function(){var b=this,c=b.eventNS,d=b.revertSettings;b.trigger("destroy"),b.off(),b.$wrapper.remove(),b.$dropdown.remove(),b.$input.html("").append(d.$children).removeAttr("tabindex").attr({tabindex:d.tabindex}).show(),a(window).off(c),a(document).off(c),a(document.body).off(c),delete b.$input[0].selectize},render:function(a,b){var c,d,e="",f=!1,g=this,h=/^[\t ]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i;return("option"===a||"item"===a)&&(c=w(b[g.settings.valueField]),f=!!c),f&&(v(g.renderCache[a])||(g.renderCache[a]={}),g.renderCache[a].hasOwnProperty(c))?g.renderCache[a][c]:(e=g.settings.render[a].apply(this,[b,x]),("option"===a||"option_create"===a)&&(e=e.replace(h,"<$1 data-selectable")),"optgroup"===a&&(d=b[g.settings.optgroupValueField]||"",e=e.replace(h,'<$1 data-group="'+y(x(d))+'"')),("option"===a||"item"===a)&&(e=e.replace(h,'<$1 data-value="'+y(x(c||""))+'"')),f&&(g.renderCache[a][c]=e),e)}}),J.count=0,J.defaults={plugins:[],delimiter:",",persist:!0,diacritics:!0,create:!1,createOnBlur:!1,highlight:!0,openOnFocus:!0,maxOptions:1e3,maxItems:null,hideSelected:null,addPrecedence:!1,preload:!1,scrollDuration:60,loadThrottle:300,dataAttr:"data-data",optgroupField:"optgroup",valueField:"value",labelField:"text",optgroupLabelField:"label",optgroupValueField:"value",optgroupOrder:null,sortField:"$order",searchField:["text"],searchConjunction:"and",mode:null,wrapperClass:"selectize-control",inputClass:"selectize-input",dropdownClass:"selectize-dropdown",dropdownContentClass:"selectize-dropdown-content",dropdownParent:null,render:{}},a.fn.selectize=function(b){var c=a.fn.selectize.defaults,d=a.extend({},c,b),e=d.dataAttr,f=d.labelField,g=d.valueField,h=d.optgroupField,i=d.optgroupLabelField,j=d.optgroupValueField,k=function(b,c){var e,h,i,j,k=a.trim(b.val()||""); -if(k.length){for(i=k.split(d.delimiter),e=0,h=i.length;h>e;e++)j={},j[f]=i[e],j[g]=i[e],c.options[i[e]]=j;c.items=i}},l=function(b,c){var d,k,l,m,n=0,o=c.options,p=function(a){var b=e&&a.attr(e);return"string"==typeof b&&b.length?JSON.parse(b):null},q=function(b,d){var e,i;if(b=a(b),e=b.attr("value")||"",e.length){if(o.hasOwnProperty(e))return d&&(o[e].optgroup?a.isArray(o[e].optgroup)?o[e].optgroup.push(d):o[e].optgroup=[o[e].optgroup,d]:o[e].optgroup=d),void 0;i=p(b)||{},i[f]=i[f]||b.text(),i[g]=i[g]||e,i[h]=i[h]||d,i.$order=++n,o[e]=i,b.is(":selected")&&c.items.push(e)}},r=function(b){var d,e,f,g,h;for(b=a(b),f=b.attr("label"),f&&(g=p(b)||{},g[i]=f,g[j]=f,c.optgroups[f]=g),h=a("option",b),d=0,e=h.length;e>d;d++)q(h[d],f)};for(c.maxItems=b.attr("multiple")?null:1,m=b.children(),d=0,k=m.length;k>d;d++)l=m[d].tagName.toLowerCase(),"optgroup"===l?r(m[d]):"option"===l&&q(m[d])};return this.each(function(){if(!this.selectize){var d,e=a(this),f=this.tagName.toLowerCase(),g={placeholder:e.children('option[value=""]').text()||e.attr("placeholder"),options:{},optgroups:{},items:[]};"select"===f?l(e,g):k(e,g),d=new J(e,a.extend(!0,{},c,g,b)),e.data("selectize",d),e.addClass("selectized")}})},a.fn.selectize.defaults=J.defaults,J.define("drag_drop",function(){if(!a.fn.sortable)throw new Error('The "drag_drop" plugin requires jQuery UI "sortable".');if("multi"===this.settings.mode){var b=this;b.lock=function(){var a=b.lock;return function(){var c=b.$control.data("sortable");return c&&c.disable(),a.apply(b,arguments)}}(),b.unlock=function(){var a=b.unlock;return function(){var c=b.$control.data("sortable");return c&&c.enable(),a.apply(b,arguments)}}(),b.setup=function(){var c=b.setup;return function(){c.apply(this,arguments);var d=b.$control.sortable({items:"[data-value]",forcePlaceholderSize:!0,disabled:b.isLocked,start:function(a,b){b.placeholder.css("width",b.helper.css("width")),d.css({overflow:"visible"})},stop:function(){d.css({overflow:"hidden"});var c=b.$activeItems?b.$activeItems.slice():null,e=[];d.children("[data-value]").each(function(){e.push(a(this).attr("data-value"))}),b.setValue(e),b.setActiveItem(c)}})}}()}}),J.define("dropdown_header",function(b){var c=this;b=a.extend({title:"Untitled",headerClass:"selectize-dropdown-header",titleRowClass:"selectize-dropdown-header-title",labelClass:"selectize-dropdown-header-label",closeClass:"selectize-dropdown-header-close",html:function(a){return'
    '+'
    '+''+a.title+""+'×'+"
    "+"
    "}},b),c.setup=function(){var d=c.setup;return function(){d.apply(c,arguments),c.$dropdown_header=a(b.html(b)),c.$dropdown.prepend(c.$dropdown_header)}}()}),J.define("optgroup_columns",function(b){var c=this;b=a.extend({equalizeWidth:!0,equalizeHeight:!0},b),this.getAdjacentOption=function(b,c){var d=b.closest("[data-group]").find("[data-selectable]"),e=d.index(b)+c;return e>=0&&ed;d++)f=Math.max(f,j.eq(d).height());j.css({height:f})}b.equalizeWidth&&(i=c.$dropdown_content.innerWidth(),g=Math.round(i/e),j.css({width:g}),e>1&&(h=i-g*(e-1),j.eq(e-1).css({width:h})))}};(b.equalizeHeight||b.equalizeWidth)&&(z.after(this,"positionDropdown",d),z.after(this,"refreshOptions",d))}),J.define("remove_button",function(b){if("single"!==this.settings.mode){b=a.extend({label:"×",title:"Remove",className:"remove",append:!0},b);var c=this,d=''+b.label+"",e=function(a,b){var c=a.search(/(<\/[^>]+>\s*)$/);return a.substring(0,c)+b+a.substring(c)};this.setup=function(){var f=c.setup;return function(){if(b.append){var g=c.settings.render.item;c.settings.render.item=function(){return e(g.apply(this,arguments),d)}}f.apply(this,arguments),this.$control.on("click","."+b.className,function(b){if(b.preventDefault(),!c.isLocked){var d=a(b.target).parent();c.setActiveItem(d),c.deleteSelection()&&c.setCaret(c.items.length)}})}}()}}),J.define("restore_on_backspace",function(a){var b=this;a.text=a.text||function(a){return a[this.settings.labelField]},this.onKeyDown=function(){var c=b.onKeyDown;return function(b){var d,e;return b.keyCode===n&&""===this.$control_input.val()&&!this.$activeItems.length&&(d=this.caretPos-1,d>=0&&db;b++){if(f=e(j[b]),this.settings.diacritics)for(h in g)g.hasOwnProperty(h)&&(f=f.replace(new RegExp(h,"g"),g[h]));i.push({string:j[b],regex:new RegExp(f,"i")})}return i},a.prototype.iterator=function(a,b){var c;c=f(a)?Array.prototype.forEach||function(a){for(var b=0,c=this.length;c>b;b++)a(this[b],b,this)}:function(a){for(var b in this)this.hasOwnProperty(b)&&a(this[b],b,this)},c.apply(a,[b])},a.prototype.getScoreFunction=function(a,b){var c,d,e,f;c=this,a=c.prepareSearch(a,b),e=a.tokens,d=a.options.fields,f=e.length;var g=function(a,b){var c,d;return a?(a=String(a||""),d=a.search(b.regex),-1===d?0:(c=b.string.length/a.length,0===d&&(c+=.5),c)):0},h=function(){var a=d.length;return a?1===a?function(a,b){return g(b[d[0]],a)}:function(b,c){for(var e=0,f=0;a>e;e++)f+=g(c[d[e]],b);return f/a}:function(){return 0}}();return f?1===f?function(a){return h(e[0],a)}:"and"===a.options.conjunction?function(a){for(var b,c=0,d=0;f>c;c++){if(b=h(e[c],a),0>=b)return 0;d+=b}return d/f}:function(a){for(var b=0,c=0;f>b;b++)c+=h(e[b],a);return c/f}:function(){return 0}},a.prototype.getSortFunction=function(a,c){var d,e,f,g,h,i,j,k,l,m,n;if(f=this,a=f.prepareSearch(a,c),n=!a.query&&c.sort_empty||c.sort,l=function(a,b){return"$score"===a?b.score:f.items[b.id][a]},h=[],n)for(d=0,e=n.length;e>d;d++)(a.query||"$score"!==n[d].field)&&h.push(n[d]);if(a.query){for(m=!0,d=0,e=h.length;e>d;d++)if("$score"===h[d].field){m=!1;break}m&&h.unshift({field:"$score",direction:"desc"})}else for(d=0,e=h.length;e>d;d++)if("$score"===h[d].field){h.splice(d,1);break}for(k=[],d=0,e=h.length;e>d;d++)k.push("desc"===h[d].direction?-1:1);return i=h.length,i?1===i?(g=h[0].field,j=k[0],function(a,c){return j*b(l(g,a),l(g,c))}):function(a,c){var d,e,f;for(d=0;i>d;d++)if(f=h[d].field,e=k[d]*b(l(f,a),l(f,c)))return e;return 0}:null},a.prototype.prepareSearch=function(a,b){if("object"==typeof a)return a;b=c({},b);var d=b.fields,e=b.sort,g=b.sort_empty;return d&&!f(d)&&(b.fields=[d]),e&&!f(e)&&(b.sort=[e]),g&&!f(g)&&(b.sort_empty=[g]),{options:b,query:String(a||"").toLowerCase(),tokens:this.tokenize(a),total:0,items:[]}},a.prototype.search=function(a,b){var c,d,e,f,g=this;return d=this.prepareSearch(a,b),b=d.options,a=d.query,f=b.score||g.getScoreFunction(d),a.length?g.iterator(g.items,function(a,e){c=f(a),(b.filter===!1||c>0)&&d.items.push({score:c,id:e})}):g.iterator(g.items,function(a,b){d.items.push({score:1,id:b})}),e=g.getSortFunction(d,b),e&&d.items.sort(e),d.total=d.items.length,"number"==typeof b.limit&&(d.items=d.items.slice(0,b.limit)),d};var b=function(a,b){return"number"==typeof a&&"number"==typeof b?a>b?1:b>a?-1:0:(a=h(String(a||"")),b=h(String(b||"")),a>b?1:b>a?-1:0)},c=function(a){var b,c,d,e;for(b=1,c=arguments.length;c>b;b++)if(e=arguments[b])for(d in e)e.hasOwnProperty(d)&&(a[d]=e[d]);return a},d=function(a){return(a+"").replace(/^\s+|\s+$|/g,"")},e=function(a){return(a+"").replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")},f=Array.isArray||$&&$.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)},g={a:"[aÀÁÂÃÄÅàáâãäåĀāąĄ]",c:"[cÇçćĆčČ]",d:"[dđĐďĎ]",e:"[eÈÉÊËèéêëěĚĒēęĘ]",i:"[iÌÍÎÏìíîïĪī]",l:"[lłŁ]",n:"[nÑñňŇńŃ]",o:"[oÒÓÔÕÕÖØòóôõöøŌō]",r:"[rřŘ]",s:"[sŠšśŚ]",t:"[tťŤ]",u:"[uÙÚÛÜùúûüůŮŪū]",y:"[yŸÿýÝ]",z:"[zŽžżŻźŹ]"},h=function(){var a,b,c,d,e="",f={};for(c in g)if(g.hasOwnProperty(c))for(d=g[c].substring(2,g[c].length-1),e+=d,a=0,b=d.length;b>a;a++)f[d.charAt(a)]=c;var h=new RegExp("["+e+"]","g");return function(a){return a.replace(h,function(a){return f[a]}).toLowerCase()}}();return a}),function(a,b){"function"==typeof define&&define.amd?define("microplugin",b):"object"==typeof exports?module.exports=b():a.MicroPlugin=b()}(this,function(){var a={};a.mixin=function(a){a.plugins={},a.prototype.initializePlugins=function(a){var c,d,e,f=this,g=[];if(f.plugins={names:[],settings:{},requested:{},loaded:{}},b.isArray(a))for(c=0,d=a.length;d>c;c++)"string"==typeof a[c]?g.push(a[c]):(f.plugins.settings[a[c].name]=a[c].options,g.push(a[c].name));else if(a)for(e in a)a.hasOwnProperty(e)&&(f.plugins.settings[e]=a[e],g.push(e));for(;g.length;)f.require(g.shift())},a.prototype.loadPlugin=function(b){var c=this,d=c.plugins,e=a.plugins[b];if(!a.plugins.hasOwnProperty(b))throw new Error('Unable to find "'+b+'" plugin');d.requested[b]=!0,d.loaded[b]=e.fn.apply(c,[c.plugins.settings[b]||{}]),d.names.push(b)},a.prototype.require=function(a){var b=this,c=b.plugins;if(!b.plugins.loaded.hasOwnProperty(a)){if(c.requested[a])throw new Error('Plugin has circular dependency ("'+a+'")');b.loadPlugin(a)}return c.loaded[a]},a.define=function(b,c){a.plugins[b]={name:b,fn:c}}};var b={isArray:Array.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)}};return a}),function(a,b){"function"==typeof define&&define.amd?define("selectize",["jquery","sifter","microplugin"],b):"object"==typeof exports?module.exports=b(require("jquery"),require("sifter"),require("microplugin")):a.Selectize=b(a.jQuery,a.Sifter,a.MicroPlugin)}(this,function(a,b,c){"use strict";var d=function(a,b){if("string"!=typeof b||b.length){var c="string"==typeof b?new RegExp(b,"i"):b,d=function(a){var b=0;if(3===a.nodeType){var e=a.data.search(c);if(e>=0&&a.data.length>0){var f=a.data.match(c),g=document.createElement("span");g.className="highlight";var h=a.splitText(e),i=(h.splitText(f[0].length),h.cloneNode(!0));g.appendChild(i),h.parentNode.replaceChild(g,h),b=1}}else if(1===a.nodeType&&a.childNodes&&!/(script|style)/i.test(a.tagName))for(var j=0;j/g,">").replace(/"/g,""")},B=function(a){return(a+"").replace(/\$/g,"$$$$")},C={};C.before=function(a,b,c){var d=a[b];a[b]=function(){return c.apply(a,arguments),d.apply(a,arguments)}},C.after=function(a,b,c){var d=a[b];a[b]=function(){var b=d.apply(a,arguments);return c.apply(a,arguments),b}};var D=function(a){var b=!1;return function(){b||(b=!0,a.apply(this,arguments))}},E=function(a,b){var c;return function(){var d=this,e=arguments;window.clearTimeout(c),c=window.setTimeout(function(){a.apply(d,e)},b)}},F=function(a,b,c){var d,e=a.trigger,f={};a.trigger=function(){var c=arguments[0];return-1===b.indexOf(c)?e.apply(a,arguments):void(f[c]=arguments)},c.apply(a,[]),a.trigger=e;for(d in f)f.hasOwnProperty(d)&&e.apply(a,f[d])},G=function(a,b,c,d){a.on(b,c,function(b){for(var c=b.target;c&&c.parentNode!==a[0];)c=c.parentNode;return b.currentTarget=c,d.apply(this,[b])})},H=function(a){var b={};if("selectionStart"in a)b.start=a.selectionStart,b.length=a.selectionEnd-b.start;else if(document.selection){a.focus();var c=document.selection.createRange(),d=document.selection.createRange().text.length;c.moveStart("character",-a.value.length),b.start=c.text.length-d,b.length=d}return b},I=function(a,b,c){var d,e,f={};if(c)for(d=0,e=c.length;e>d;d++)f[c[d]]=a.css(c[d]);else f=a.css();b.css(f)},J=function(b,c){if(!b)return 0;var d=a("").css({position:"absolute",top:-99999,left:-99999,width:"auto",padding:0,whiteSpace:"pre"}).text(b).appendTo("body");I(c,d,["letterSpacing","fontSize","fontFamily","fontWeight","textTransform"]);var e=d.width();return d.remove(),e},K=function(a){var b=null,c=function(c,d){var e,f,g,h,i,j,k,l;c=c||window.event||{},d=d||{},c.metaKey||c.altKey||(d.force||a.data("grow")!==!1)&&(e=a.val(),c.type&&"keydown"===c.type.toLowerCase()&&(f=c.keyCode,g=f>=97&&122>=f||f>=65&&90>=f||f>=48&&57>=f||32===f,f===q||f===p?(l=H(a[0]),l.length?e=e.substring(0,l.start)+e.substring(l.start+l.length):f===p&&l.start?e=e.substring(0,l.start-1)+e.substring(l.start+1):f===q&&"undefined"!=typeof l.start&&(e=e.substring(0,l.start)+e.substring(l.start+1))):g&&(j=c.shiftKey,k=String.fromCharCode(c.keyCode),k=j?k.toUpperCase():k.toLowerCase(),e+=k)),h=a.attr("placeholder"),!e&&h&&(e=h),i=J(e,a)+4,i!==b&&(b=i,a.width(i),a.triggerHandler("resize")))};a.on("keydown keyup update blur",c),c()},L=function(c,d){var e,f,g,h,i=this;h=c[0],h.selectize=i;var j=window.getComputedStyle&&window.getComputedStyle(h,null);if(g=j?j.getPropertyValue("direction"):h.currentStyle&&h.currentStyle.direction,g=g||c.parents("[dir]:first").attr("dir")||"",a.extend(i,{order:0,settings:d,$input:c,tabIndex:c.attr("tabindex")||"",tagType:"select"===h.tagName.toLowerCase()?v:w,rtl:/rtl/i.test(g),eventNS:".selectize"+ ++L.count,highlightedValue:null,isOpen:!1,isDisabled:!1,isRequired:c.is("[required]"),isInvalid:!1,isLocked:!1,isFocused:!1,isInputHidden:!1,isSetup:!1,isShiftDown:!1,isCmdDown:!1,isCtrlDown:!1,ignoreFocus:!1,ignoreBlur:!1,ignoreHover:!1,hasOptions:!1,currentResults:null,lastValue:"",caretPos:0,loading:0,loadedSearches:{},$activeOption:null,$activeItems:[],optgroups:{},options:{},userOptions:{},items:[],renderCache:{},onSearchChange:null===d.loadThrottle?i.onSearchChange:E(i.onSearchChange,d.loadThrottle)}),i.sifter=new b(this.options,{diacritics:d.diacritics}),i.settings.options){for(e=0,f=i.settings.options.length;f>e;e++)i.registerOption(i.settings.options[e]);delete i.settings.options}if(i.settings.optgroups){for(e=0,f=i.settings.optgroups.length;f>e;e++)i.registerOptionGroup(i.settings.optgroups[e]);delete i.settings.optgroups}i.settings.mode=i.settings.mode||(1===i.settings.maxItems?"single":"multi"),"boolean"!=typeof i.settings.hideSelected&&(i.settings.hideSelected="multi"===i.settings.mode),i.initializePlugins(i.settings.plugins),i.setupCallbacks(),i.setupTemplates(),i.setup()};return e.mixin(L),c.mixin(L),a.extend(L.prototype,{setup:function(){var b,c,d,e,g,h,i,j,k,l=this,m=l.settings,n=l.eventNS,o=a(window),p=a(document),q=l.$input;if(i=l.settings.mode,j=q.attr("class")||"",b=a("
    ").addClass(m.wrapperClass).addClass(j).addClass(i),c=a("
    ").addClass(m.inputClass).addClass("items").appendTo(b),d=a('').appendTo(c).attr("tabindex",q.is(":disabled")?"-1":l.tabIndex),h=a(m.dropdownParent||b),e=a("
    ").addClass(m.dropdownClass).addClass(i).hide().appendTo(h),g=a("
    ").addClass(m.dropdownContentClass).appendTo(e),l.settings.copyClassesToDropdown&&e.addClass(j),b.css({width:q[0].style.width}),l.plugins.names.length&&(k="plugin-"+l.plugins.names.join(" plugin-"),b.addClass(k),e.addClass(k)),(null===m.maxItems||m.maxItems>1)&&l.tagType===v&&q.attr("multiple","multiple"),l.settings.placeholder&&d.attr("placeholder",m.placeholder),!l.settings.splitOn&&l.settings.delimiter){var u=l.settings.delimiter.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");l.settings.splitOn=new RegExp("\\s*"+u+"+\\s*")}q.attr("autocorrect")&&d.attr("autocorrect",q.attr("autocorrect")),q.attr("autocapitalize")&&d.attr("autocapitalize",q.attr("autocapitalize")),l.$wrapper=b,l.$control=c,l.$control_input=d,l.$dropdown=e,l.$dropdown_content=g,e.on("mouseenter","[data-selectable]",function(){return l.onOptionHover.apply(l,arguments)}),e.on("mousedown click","[data-selectable]",function(){return l.onOptionSelect.apply(l,arguments)}),G(c,"mousedown","*:not(input)",function(){return l.onItemSelect.apply(l,arguments)}),K(d),c.on({mousedown:function(){return l.onMouseDown.apply(l,arguments)},click:function(){return l.onClick.apply(l,arguments)}}),d.on({mousedown:function(a){a.stopPropagation()},keydown:function(){return l.onKeyDown.apply(l,arguments)},keyup:function(){return l.onKeyUp.apply(l,arguments)},keypress:function(){return l.onKeyPress.apply(l,arguments)},resize:function(){l.positionDropdown.apply(l,[])},blur:function(){return l.onBlur.apply(l,arguments)},focus:function(){return l.ignoreBlur=!1,l.onFocus.apply(l,arguments)},paste:function(){return l.onPaste.apply(l,arguments)}}),p.on("keydown"+n,function(a){l.isCmdDown=a[f?"metaKey":"ctrlKey"],l.isCtrlDown=a[f?"altKey":"ctrlKey"],l.isShiftDown=a.shiftKey}),p.on("keyup"+n,function(a){a.keyCode===t&&(l.isCtrlDown=!1),a.keyCode===r&&(l.isShiftDown=!1),a.keyCode===s&&(l.isCmdDown=!1)}),p.on("mousedown"+n,function(a){if(l.isFocused){if(a.target===l.$dropdown[0]||a.target.parentNode===l.$dropdown[0])return!1;l.$control.has(a.target).length||a.target===l.$control[0]||l.blur(a.target)}}),o.on(["scroll"+n,"resize"+n].join(" "),function(){l.isOpen&&l.positionDropdown.apply(l,arguments)}),o.on("mousemove"+n,function(){l.ignoreHover=!1}),this.revertSettings={$children:q.children().detach(),tabindex:q.attr("tabindex")},q.attr("tabindex",-1).hide().after(l.$wrapper),a.isArray(m.items)&&(l.setValue(m.items),delete m.items),x&&q.on("invalid"+n,function(a){a.preventDefault(),l.isInvalid=!0,l.refreshState()}),l.updateOriginalInput(),l.refreshItems(),l.refreshState(),l.updatePlaceholder(),l.isSetup=!0,q.is(":disabled")&&l.disable(),l.on("change",this.onChange),q.data("selectize",l),q.addClass("selectized"),l.trigger("initialize"),m.preload===!0&&l.onSearchChange("")},setupTemplates:function(){var b=this,c=b.settings.labelField,d=b.settings.optgroupLabelField,e={optgroup:function(a){return'
    '+a.html+"
    "},optgroup_header:function(a,b){return'
    '+b(a[d])+"
    "},option:function(a,b){return'
    '+b(a[c])+"
    "},item:function(a,b){return'
    '+b(a[c])+"
    "},option_create:function(a,b){return'
    Add '+b(a.input)+"…
    "}};b.settings.render=a.extend({},e,b.settings.render)},setupCallbacks:function(){var a,b,c={initialize:"onInitialize",change:"onChange",item_add:"onItemAdd",item_remove:"onItemRemove",clear:"onClear",option_add:"onOptionAdd",option_remove:"onOptionRemove",option_clear:"onOptionClear",optgroup_add:"onOptionGroupAdd",optgroup_remove:"onOptionGroupRemove",optgroup_clear:"onOptionGroupClear",dropdown_open:"onDropdownOpen",dropdown_close:"onDropdownClose",type:"onType",load:"onLoad",focus:"onFocus",blur:"onBlur"};for(a in c)c.hasOwnProperty(a)&&(b=this.settings[c[a]],b&&this.on(a,b))},onClick:function(a){var b=this;b.isFocused||(b.focus(),a.preventDefault())},onMouseDown:function(b){{var c=this,d=b.isDefaultPrevented();a(b.target)}if(c.isFocused){if(b.target!==c.$control_input[0])return"single"===c.settings.mode?c.isOpen?c.close():c.open():d||c.setActiveItem(null),!1}else d||window.setTimeout(function(){c.focus()},0)},onChange:function(){this.$input.trigger("change")},onPaste:function(b){var c=this;c.isFull()||c.isInputHidden||c.isLocked?b.preventDefault():c.settings.splitOn&&setTimeout(function(){for(var b=a.trim(c.$control_input.val()||"").split(c.settings.splitOn),d=0,e=b.length;e>d;d++)c.createItem(b[d])},0)},onKeyPress:function(a){if(this.isLocked)return a&&a.preventDefault();var b=String.fromCharCode(a.keyCode||a.which);return this.settings.create&&"multi"===this.settings.mode&&b===this.settings.delimiter?(this.createItem(),a.preventDefault(),!1):void 0},onKeyDown:function(a){var b=(a.target===this.$control_input[0],this);if(b.isLocked)return void(a.keyCode!==u&&a.preventDefault());switch(a.keyCode){case g:if(b.isCmdDown)return void b.selectAll();break;case i:return void(b.isOpen&&(a.preventDefault(),a.stopPropagation(),b.close()));case o:if(!a.ctrlKey||a.altKey)break;case n:if(!b.isOpen&&b.hasOptions)b.open();else if(b.$activeOption){b.ignoreHover=!0;var c=b.getAdjacentOption(b.$activeOption,1);c.length&&b.setActiveOption(c,!0,!0)}return void a.preventDefault();case l:if(!a.ctrlKey||a.altKey)break;case k:if(b.$activeOption){b.ignoreHover=!0;var d=b.getAdjacentOption(b.$activeOption,-1);d.length&&b.setActiveOption(d,!0,!0)}return void a.preventDefault();case h:return void(b.isOpen&&b.$activeOption&&(b.onOptionSelect({currentTarget:b.$activeOption}),a.preventDefault()));case j:return void b.advanceSelection(-1,a);case m:return void b.advanceSelection(1,a);case u:return b.settings.selectOnTab&&b.isOpen&&b.$activeOption&&(b.onOptionSelect({currentTarget:b.$activeOption}),b.isFull()||a.preventDefault()),void(b.settings.create&&b.createItem()&&a.preventDefault());case p:case q:return void b.deleteSelection(a)}return!b.isFull()&&!b.isInputHidden||(f?a.metaKey:a.ctrlKey)?void 0:void a.preventDefault()},onKeyUp:function(a){var b=this;if(b.isLocked)return a&&a.preventDefault();var c=b.$control_input.val()||"";b.lastValue!==c&&(b.lastValue=c,b.onSearchChange(c),b.refreshOptions(),b.trigger("type",c))},onSearchChange:function(a){var b=this,c=b.settings.load;c&&(b.loadedSearches.hasOwnProperty(a)||(b.loadedSearches[a]=!0,b.load(function(d){c.apply(b,[a,d])})))},onFocus:function(a){var b=this,c=b.isFocused;return b.isDisabled?(b.blur(),a&&a.preventDefault(),!1):void(b.ignoreFocus||(b.isFocused=!0,"focus"===b.settings.preload&&b.onSearchChange(""),c||b.trigger("focus"),b.$activeItems.length||(b.showInput(),b.setActiveItem(null),b.refreshOptions(!!b.settings.openOnFocus)),b.refreshState()))},onBlur:function(a,b){var c=this;if(c.isFocused&&(c.isFocused=!1,!c.ignoreFocus)){if(!c.ignoreBlur&&document.activeElement===c.$dropdown_content[0])return c.ignoreBlur=!0,void c.onFocus(a);var d=function(){c.close(),c.setTextboxValue(""),c.setActiveItem(null),c.setActiveOption(null),c.setCaret(c.items.length),c.refreshState(),(b||document.body).focus(),c.ignoreFocus=!1,c.trigger("blur")};c.ignoreFocus=!0,c.settings.create&&c.settings.createOnBlur?c.createItem(null,!1,d):d()}},onOptionHover:function(a){this.ignoreHover||this.setActiveOption(a.currentTarget,!1)},onOptionSelect:function(b){var c,d,e=this;b.preventDefault&&(b.preventDefault(),b.stopPropagation()),d=a(b.currentTarget),d.hasClass("create")?e.createItem(null,function(){e.settings.closeAfterSelect&&e.close()}):(c=d.attr("data-value"),"undefined"!=typeof c&&(e.lastQuery=null,e.setTextboxValue(""),e.addItem(c),e.settings.closeAfterSelect?e.close():!e.settings.hideSelected&&b.type&&/mouse/.test(b.type)&&e.setActiveOption(e.getOption(c))))},onItemSelect:function(a){var b=this;b.isLocked||"multi"===b.settings.mode&&(a.preventDefault(),b.setActiveItem(a.currentTarget,a))},load:function(a){var b=this,c=b.$wrapper.addClass(b.settings.loadingClass);b.loading++,a.apply(b,[function(a){b.loading=Math.max(b.loading-1,0),a&&a.length&&(b.addOption(a),b.refreshOptions(b.isFocused&&!b.isInputHidden)),b.loading||c.removeClass(b.settings.loadingClass),b.trigger("load",a)}])},setTextboxValue:function(a){var b=this.$control_input,c=b.val()!==a;c&&(b.val(a).triggerHandler("update"),this.lastValue=a)},getValue:function(){return this.tagType===v&&this.$input.attr("multiple")?this.items:this.items.join(this.settings.delimiter)},setValue:function(a,b){var c=b?[]:["change"];F(this,c,function(){this.clear(b),this.addItems(a,b)})},setActiveItem:function(b,c){var d,e,f,g,h,i,j,k,l=this;if("single"!==l.settings.mode){if(b=a(b),!b.length)return a(l.$activeItems).removeClass("active"),l.$activeItems=[],void(l.isFocused&&l.showInput());if(d=c&&c.type.toLowerCase(),"mousedown"===d&&l.isShiftDown&&l.$activeItems.length){for(k=l.$control.children(".active:last"),g=Array.prototype.indexOf.apply(l.$control[0].childNodes,[k[0]]),h=Array.prototype.indexOf.apply(l.$control[0].childNodes,[b[0]]),g>h&&(j=g,g=h,h=j),e=g;h>=e;e++)i=l.$control[0].childNodes[e],-1===l.$activeItems.indexOf(i)&&(a(i).addClass("active"),l.$activeItems.push(i));c.preventDefault()}else"mousedown"===d&&l.isCtrlDown||"keydown"===d&&this.isShiftDown?b.hasClass("active")?(f=l.$activeItems.indexOf(b[0]),l.$activeItems.splice(f,1),b.removeClass("active")):l.$activeItems.push(b.addClass("active")[0]):(a(l.$activeItems).removeClass("active"),l.$activeItems=[b.addClass("active")[0]]);l.hideInput(),this.isFocused||l.focus()}},setActiveOption:function(b,c,d){var e,f,g,h,i,j=this;j.$activeOption&&j.$activeOption.removeClass("active"),j.$activeOption=null,b=a(b),b.length&&(j.$activeOption=b.addClass("active"),(c||!y(c))&&(e=j.$dropdown_content.height(),f=j.$activeOption.outerHeight(!0),c=j.$dropdown_content.scrollTop()||0,g=j.$activeOption.offset().top-j.$dropdown_content.offset().top+c,h=g,i=g-e+f,g+f>e+c?j.$dropdown_content.stop().animate({scrollTop:i},d?j.settings.scrollDuration:0):c>g&&j.$dropdown_content.stop().animate({scrollTop:h},d?j.settings.scrollDuration:0)))},selectAll:function(){var a=this;"single"!==a.settings.mode&&(a.$activeItems=Array.prototype.slice.apply(a.$control.children(":not(input)").addClass("active")),a.$activeItems.length&&(a.hideInput(),a.close()),a.focus())},hideInput:function(){var a=this;a.setTextboxValue(""),a.$control_input.css({opacity:0,position:"absolute",left:a.rtl?1e4:-1e4}),a.isInputHidden=!0},showInput:function(){this.$control_input.css({opacity:1,position:"relative",left:0}),this.isInputHidden=!1},focus:function(){var a=this;a.isDisabled||(a.ignoreFocus=!0,a.$control_input[0].focus(),window.setTimeout(function(){a.ignoreFocus=!1,a.onFocus()},0))},blur:function(a){this.$control_input[0].blur(),this.onBlur(null,a)},getScoreFunction:function(a){return this.sifter.getScoreFunction(a,this.getSearchOptions())},getSearchOptions:function(){var a=this.settings,b=a.sortField;return"string"==typeof b&&(b=[{field:b}]),{fields:a.searchField,conjunction:a.searchConjunction,sort:b}},search:function(b){var c,d,e,f=this,g=f.settings,h=this.getSearchOptions();if(g.score&&(e=f.settings.score.apply(this,[b]),"function"!=typeof e))throw new Error('Selectize "score" setting must be a function that returns a function');if(b!==f.lastQuery?(f.lastQuery=b,d=f.sifter.search(b,a.extend(h,{score:e})),f.currentResults=d):d=a.extend(!0,{},f.currentResults),g.hideSelected)for(c=d.items.length-1;c>=0;c--)-1!==f.items.indexOf(z(d.items[c].id))&&d.items.splice(c,1);return d},refreshOptions:function(b){var c,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s;"undefined"==typeof b&&(b=!0);var t=this,u=a.trim(t.$control_input.val()),v=t.search(u),w=t.$dropdown_content,x=t.$activeOption&&z(t.$activeOption.attr("data-value"));for(g=v.items.length,"number"==typeof t.settings.maxOptions&&(g=Math.min(g,t.settings.maxOptions)),h={},i=[],c=0;g>c;c++)for(j=t.options[v.items[c].id],k=t.render("option",j),l=j[t.settings.optgroupField]||"",m=a.isArray(l)?l:[l],e=0,f=m&&m.length;f>e;e++)l=m[e],t.optgroups.hasOwnProperty(l)||(l=""),h.hasOwnProperty(l)||(h[l]=[],i.push(l)),h[l].push(k);for(this.settings.lockOptgroupOrder&&i.sort(function(a,b){var c=t.optgroups[a].$order||0,d=t.optgroups[b].$order||0;return c-d}),n=[],c=0,g=i.length;g>c;c++)l=i[c],t.optgroups.hasOwnProperty(l)&&h[l].length?(o=t.render("optgroup_header",t.optgroups[l])||"",o+=h[l].join(""),n.push(t.render("optgroup",a.extend({},t.optgroups[l],{html:o})))):n.push(h[l].join(""));if(w.html(n.join("")),t.settings.highlight&&v.query.length&&v.tokens.length)for(c=0,g=v.tokens.length;g>c;c++)d(w,v.tokens[c].regex);if(!t.settings.hideSelected)for(c=0,g=t.items.length;g>c;c++)t.getOption(t.items[c]).addClass("selected");p=t.canCreate(u),p&&(w.prepend(t.render("option_create",{input:u})),s=a(w[0].childNodes[0])),t.hasOptions=v.items.length>0||p,t.hasOptions?(v.items.length>0?(r=x&&t.getOption(x),r&&r.length?q=r:"single"===t.settings.mode&&t.items.length&&(q=t.getOption(t.items[0])),q&&q.length||(q=s&&!t.settings.addPrecedence?t.getAdjacentOption(s,1):w.find("[data-selectable]:first"))):q=s,t.setActiveOption(q),b&&!t.isOpen&&t.open()):(t.setActiveOption(null),b&&t.isOpen&&t.close())},addOption:function(b){var c,d,e,f=this;if(a.isArray(b))for(c=0,d=b.length;d>c;c++)f.addOption(b[c]);else(e=f.registerOption(b))&&(f.userOptions[e]=!0,f.lastQuery=null,f.trigger("option_add",e,b))},registerOption:function(a){var b=z(a[this.settings.valueField]);return!b||this.options.hasOwnProperty(b)?!1:(a.$order=a.$order||++this.order,this.options[b]=a,b)},registerOptionGroup:function(a){var b=z(a[this.settings.optgroupValueField]);return b?(a.$order=a.$order||++this.order,this.optgroups[b]=a,b):!1},addOptionGroup:function(a,b){b[this.settings.optgroupValueField]=a,(a=this.registerOptionGroup(b))&&this.trigger("optgroup_add",a,b)},removeOptionGroup:function(a){this.optgroups.hasOwnProperty(a)&&(delete this.optgroups[a],this.renderCache={},this.trigger("optgroup_remove",a))},clearOptionGroups:function(){this.optgroups={},this.renderCache={},this.trigger("optgroup_clear")},updateOption:function(b,c){var d,e,f,g,h,i,j,k=this;if(b=z(b),f=z(c[k.settings.valueField]),null!==b&&k.options.hasOwnProperty(b)){if("string"!=typeof f)throw new Error("Value must be set in option data");j=k.options[b].$order,f!==b&&(delete k.options[b],g=k.items.indexOf(b),-1!==g&&k.items.splice(g,1,f)),c.$order=c.$order||j,k.options[f]=c,h=k.renderCache.item,i=k.renderCache.option,h&&(delete h[b],delete h[f]),i&&(delete i[b],delete i[f]),-1!==k.items.indexOf(f)&&(d=k.getItem(b),e=a(k.render("item",c)),d.hasClass("active")&&e.addClass("active"),d.replaceWith(e)),k.lastQuery=null,k.isOpen&&k.refreshOptions(!1)}},removeOption:function(a,b){var c=this;a=z(a);var d=c.renderCache.item,e=c.renderCache.option;d&&delete d[a],e&&delete e[a],delete c.userOptions[a],delete c.options[a],c.lastQuery=null,c.trigger("option_remove",a),c.removeItem(a,b)},clearOptions:function(){var a=this;a.loadedSearches={},a.userOptions={},a.renderCache={},a.options=a.sifter.items={},a.lastQuery=null,a.trigger("option_clear"),a.clear()},getOption:function(a){return this.getElementWithValue(a,this.$dropdown_content.find("[data-selectable]"))},getAdjacentOption:function(b,c){var d=this.$dropdown.find("[data-selectable]"),e=d.index(b)+c;return e>=0&&ed;d++)if(c[d].getAttribute("data-value")===b)return a(c[d]);return a()},getItem:function(a){return this.getElementWithValue(a,this.$control.children())},addItems:function(b,c){for(var d=a.isArray(b)?b:[b],e=0,f=d.length;f>e;e++)this.isPending=f-1>e,this.addItem(d[e],c)},addItem:function(b,c){var d=c?[]:["change"];F(this,d,function(){var d,e,f,g,h,i=this,j=i.settings.mode;return b=z(b),-1!==i.items.indexOf(b)?void("single"===j&&i.close()):void(i.options.hasOwnProperty(b)&&("single"===j&&i.clear(c),"multi"===j&&i.isFull()||(d=a(i.render("item",i.options[b])),h=i.isFull(),i.items.splice(i.caretPos,0,b),i.insertAtCaret(d),(!i.isPending||!h&&i.isFull())&&i.refreshState(),i.isSetup&&(f=i.$dropdown_content.find("[data-selectable]"),i.isPending||(e=i.getOption(b),g=i.getAdjacentOption(e,1).attr("data-value"),i.refreshOptions(i.isFocused&&"single"!==j),g&&i.setActiveOption(i.getOption(g))),!f.length||i.isFull()?i.close():i.positionDropdown(),i.updatePlaceholder(),i.trigger("item_add",b,d),i.updateOriginalInput({silent:c})))))})},removeItem:function(a,b){var c,d,e,f=this;c="object"==typeof a?a:f.getItem(a),a=z(c.attr("data-value")),d=f.items.indexOf(a),-1!==d&&(c.remove(),c.hasClass("active")&&(e=f.$activeItems.indexOf(c[0]),f.$activeItems.splice(e,1)),f.items.splice(d,1),f.lastQuery=null,!f.settings.persist&&f.userOptions.hasOwnProperty(a)&&f.removeOption(a,b),d0),b.$control_input.data("grow",!c&&!d)},isFull:function(){return null!==this.settings.maxItems&&this.items.length>=this.settings.maxItems},updateOriginalInput:function(a){var b,c,d,e,f=this;if(a=a||{},f.tagType===v){for(d=[],b=0,c=f.items.length;c>b;b++)e=f.options[f.items[b]][f.settings.labelField]||"",d.push('");d.length||this.$input.attr("multiple")||d.push(''),f.$input.html(d.join(""))}else f.$input.val(f.getValue()),f.$input.attr("value",f.$input.val());f.isSetup&&(a.silent||f.trigger("change",f.$input.val()))},updatePlaceholder:function(){if(this.settings.placeholder){var a=this.$control_input;this.items.length?a.removeAttr("placeholder"):a.attr("placeholder",this.settings.placeholder),a.triggerHandler("update",{force:!0})}},open:function(){var a=this;a.isLocked||a.isOpen||"multi"===a.settings.mode&&a.isFull()||(a.focus(),a.isOpen=!0,a.refreshState(),a.$dropdown.css({visibility:"hidden",display:"block"}),a.positionDropdown(),a.$dropdown.css({visibility:"visible"}),a.trigger("dropdown_open",a.$dropdown))},close:function(){var a=this,b=a.isOpen;"single"===a.settings.mode&&a.items.length&&a.hideInput(),a.isOpen=!1,a.$dropdown.hide(),a.setActiveOption(null),a.refreshState(),b&&a.trigger("dropdown_close",a.$dropdown)},positionDropdown:function(){var a=this.$control,b="body"===this.settings.dropdownParent?a.offset():a.position();b.top+=a.outerHeight(!0),this.$dropdown.css({width:a.outerWidth(),top:b.top,left:b.left})},clear:function(a){var b=this;b.items.length&&(b.$control.children(":not(input)").remove(),b.items=[],b.lastQuery=null,b.setCaret(0),b.setActiveItem(null),b.updatePlaceholder(),b.updateOriginalInput({silent:a}),b.refreshState(),b.showInput(),b.trigger("clear"))},insertAtCaret:function(b){var c=Math.min(this.caretPos,this.items.length);0===c?this.$control.prepend(b):a(this.$control[0].childNodes[c]).before(b),this.setCaret(c+1)},deleteSelection:function(b){var c,d,e,f,g,h,i,j,k,l=this;if(e=b&&b.keyCode===p?-1:1,f=H(l.$control_input[0]),l.$activeOption&&!l.settings.hideSelected&&(i=l.getAdjacentOption(l.$activeOption,-1).attr("data-value")),g=[],l.$activeItems.length){for(k=l.$control.children(".active:"+(e>0?"last":"first")),h=l.$control.children(":not(input)").index(k),e>0&&h++,c=0,d=l.$activeItems.length;d>c;c++)g.push(a(l.$activeItems[c]).attr("data-value")); +b&&(b.preventDefault(),b.stopPropagation())}else(l.isFocused||"single"===l.settings.mode)&&l.items.length&&(0>e&&0===f.start&&0===f.length?g.push(l.items[l.caretPos-1]):e>0&&f.start===l.$control_input.val().length&&g.push(l.items[l.caretPos]));if(!g.length||"function"==typeof l.settings.onDelete&&l.settings.onDelete.apply(l,[g])===!1)return!1;for("undefined"!=typeof h&&l.setCaret(h);g.length;)l.removeItem(g.pop());return l.showInput(),l.positionDropdown(),l.refreshOptions(!0),i&&(j=l.getOption(i),j.length&&l.setActiveOption(j)),!0},advanceSelection:function(a,b){var c,d,e,f,g,h,i=this;0!==a&&(i.rtl&&(a*=-1),c=a>0?"last":"first",d=H(i.$control_input[0]),i.isFocused&&!i.isInputHidden?(f=i.$control_input.val().length,g=0>a?0===d.start&&0===d.length:d.start===f,g&&!f&&i.advanceCaret(a,b)):(h=i.$control.children(".active:"+c),h.length&&(e=i.$control.children(":not(input)").index(h),i.setActiveItem(null),i.setCaret(a>0?e+1:e))))},advanceCaret:function(a,b){var c,d,e=this;0!==a&&(c=a>0?"next":"prev",e.isShiftDown?(d=e.$control_input[c](),d.length&&(e.hideInput(),e.setActiveItem(d),b&&b.preventDefault())):e.setCaret(e.caretPos+a))},setCaret:function(b){var c=this;if(b="single"===c.settings.mode?c.items.length:Math.max(0,Math.min(c.items.length,b)),!c.isPending){var d,e,f,g;for(f=c.$control.children(":not(input)"),d=0,e=f.length;e>d;d++)g=a(f[d]).detach(),b>d?c.$control_input.before(g):c.$control.append(g)}c.caretPos=b},lock:function(){this.close(),this.isLocked=!0,this.refreshState()},unlock:function(){this.isLocked=!1,this.refreshState()},disable:function(){var a=this;a.$input.prop("disabled",!0),a.$control_input.prop("disabled",!0).prop("tabindex",-1),a.isDisabled=!0,a.lock()},enable:function(){var a=this;a.$input.prop("disabled",!1),a.$control_input.prop("disabled",!1).prop("tabindex",a.tabIndex),a.isDisabled=!1,a.unlock()},destroy:function(){var b=this,c=b.eventNS,d=b.revertSettings;b.trigger("destroy"),b.off(),b.$wrapper.remove(),b.$dropdown.remove(),b.$input.html("").append(d.$children).removeAttr("tabindex").removeClass("selectized").attr({tabindex:d.tabindex}).show(),b.$control_input.removeData("grow"),b.$input.removeData("selectize"),a(window).off(c),a(document).off(c),a(document.body).off(c),delete b.$input[0].selectize},render:function(a,b){var c,d,e="",f=!1,g=this,h=/^[\t \r\n]*<([a-z][a-z0-9\-_]*(?:\:[a-z][a-z0-9\-_]*)?)/i;return("option"===a||"item"===a)&&(c=z(b[g.settings.valueField]),f=!!c),f&&(y(g.renderCache[a])||(g.renderCache[a]={}),g.renderCache[a].hasOwnProperty(c))?g.renderCache[a][c]:(e=g.settings.render[a].apply(this,[b,A]),("option"===a||"option_create"===a)&&(e=e.replace(h,"<$1 data-selectable")),"optgroup"===a&&(d=b[g.settings.optgroupValueField]||"",e=e.replace(h,'<$1 data-group="'+B(A(d))+'"')),("option"===a||"item"===a)&&(e=e.replace(h,'<$1 data-value="'+B(A(c||""))+'"')),f&&(g.renderCache[a][c]=e),e)},clearCache:function(a){var b=this;"undefined"==typeof a?b.renderCache={}:delete b.renderCache[a]},canCreate:function(a){var b=this;if(!b.settings.create)return!1;var c=b.settings.createFilter;return!(!a.length||"function"==typeof c&&!c.apply(b,[a])||"string"==typeof c&&!new RegExp(c).test(a)||c instanceof RegExp&&!c.test(a))}}),L.count=0,L.defaults={options:[],optgroups:[],plugins:[],delimiter:",",splitOn:null,persist:!0,diacritics:!0,create:!1,createOnBlur:!1,createFilter:null,highlight:!0,openOnFocus:!0,maxOptions:1e3,maxItems:null,hideSelected:null,addPrecedence:!1,selectOnTab:!1,preload:!1,allowEmptyOption:!1,closeAfterSelect:!1,scrollDuration:60,loadThrottle:300,loadingClass:"loading",dataAttr:"data-data",optgroupField:"optgroup",valueField:"value",labelField:"text",optgroupLabelField:"label",optgroupValueField:"value",lockOptgroupOrder:!1,sortField:"$order",searchField:["text"],searchConjunction:"and",mode:null,wrapperClass:"selectize-control",inputClass:"selectize-input",dropdownClass:"selectize-dropdown",dropdownContentClass:"selectize-dropdown-content",dropdownParent:null,copyClassesToDropdown:!0,render:{}},a.fn.selectize=function(b){var c=a.fn.selectize.defaults,d=a.extend({},c,b),e=d.dataAttr,f=d.labelField,g=d.valueField,h=d.optgroupField,i=d.optgroupLabelField,j=d.optgroupValueField,k=function(b,c){var h,i,j,k,l=b.attr(e);if(l)for(c.options=JSON.parse(l),h=0,i=c.options.length;i>h;h++)c.items.push(c.options[h][g]);else{var m=a.trim(b.val()||"");if(!d.allowEmptyOption&&!m.length)return;for(j=m.split(d.delimiter),h=0,i=j.length;i>h;h++)k={},k[f]=j[h],k[g]=j[h],c.options.push(k);c.items=j}},l=function(b,c){var k,l,m,n,o=c.options,p={},q=function(a){var b=e&&a.attr(e);return"string"==typeof b&&b.length?JSON.parse(b):null},r=function(b,e){b=a(b);var i=z(b.attr("value"));if(i||d.allowEmptyOption)if(p.hasOwnProperty(i)){if(e){var j=p[i][h];j?a.isArray(j)?j.push(e):p[i][h]=[j,e]:p[i][h]=e}}else{var k=q(b)||{};k[f]=k[f]||b.text(),k[g]=k[g]||i,k[h]=k[h]||e,p[i]=k,o.push(k),b.is(":selected")&&c.items.push(i)}},s=function(b){var d,e,f,g,h;for(b=a(b),f=b.attr("label"),f&&(g=q(b)||{},g[i]=f,g[j]=f,c.optgroups.push(g)),h=a("option",b),d=0,e=h.length;e>d;d++)r(h[d],f)};for(c.maxItems=b.attr("multiple")?null:1,n=b.children(),k=0,l=n.length;l>k;k++)m=n[k].tagName.toLowerCase(),"optgroup"===m?s(n[k]):"option"===m&&r(n[k])};return this.each(function(){if(!this.selectize){var e,f=a(this),g=this.tagName.toLowerCase(),h=f.attr("placeholder")||f.attr("data-placeholder");h||d.allowEmptyOption||(h=f.children('option[value=""]').text());var i={placeholder:h,options:[],optgroups:[],items:[]};"select"===g?l(f,i):k(f,i),e=new L(f,a.extend(!0,{},c,i,b))}})},a.fn.selectize.defaults=L.defaults,a.fn.selectize.support={validity:x},L.define("drag_drop",function(){if(!a.fn.sortable)throw new Error('The "drag_drop" plugin requires jQuery UI "sortable".');if("multi"===this.settings.mode){var b=this;b.lock=function(){var a=b.lock;return function(){var c=b.$control.data("sortable");return c&&c.disable(),a.apply(b,arguments)}}(),b.unlock=function(){var a=b.unlock;return function(){var c=b.$control.data("sortable");return c&&c.enable(),a.apply(b,arguments)}}(),b.setup=function(){var c=b.setup;return function(){c.apply(this,arguments);var d=b.$control.sortable({items:"[data-value]",forcePlaceholderSize:!0,disabled:b.isLocked,start:function(a,b){b.placeholder.css("width",b.helper.css("width")),d.css({overflow:"visible"})},stop:function(){d.css({overflow:"hidden"});var c=b.$activeItems?b.$activeItems.slice():null,e=[];d.children("[data-value]").each(function(){e.push(a(this).attr("data-value"))}),b.setValue(e),b.setActiveItem(c)}})}}()}}),L.define("dropdown_header",function(b){var c=this;b=a.extend({title:"Untitled",headerClass:"selectize-dropdown-header",titleRowClass:"selectize-dropdown-header-title",labelClass:"selectize-dropdown-header-label",closeClass:"selectize-dropdown-header-close",html:function(a){return'
    '+a.title+'×
    '}},b),c.setup=function(){var d=c.setup;return function(){d.apply(c,arguments),c.$dropdown_header=a(b.html(b)),c.$dropdown.prepend(c.$dropdown_header)}}()}),L.define("optgroup_columns",function(b){var c=this;b=a.extend({equalizeWidth:!0,equalizeHeight:!0},b),this.getAdjacentOption=function(b,c){var d=b.closest("[data-group]").find("[data-selectable]"),e=d.index(b)+c;return e>=0&&e
    ',a=a.firstChild,c.body.appendChild(a),b=d.width=a.offsetWidth-a.clientWidth,c.body.removeChild(a)),b},e=function(){var e,f,g,h,i,j,k;if(k=a("[data-group]",c.$dropdown_content),f=k.length,f&&c.$dropdown_content.width()){if(b.equalizeHeight){for(g=0,e=0;f>e;e++)g=Math.max(g,k.eq(e).height());k.css({height:g})}b.equalizeWidth&&(j=c.$dropdown_content.innerWidth()-d(),h=Math.round(j/f),k.css({width:h}),f>1&&(i=j-h*(f-1),k.eq(f-1).css({width:i})))}};(b.equalizeHeight||b.equalizeWidth)&&(C.after(this,"positionDropdown",e),C.after(this,"refreshOptions",e))}),L.define("remove_button",function(b){if("single"!==this.settings.mode){b=a.extend({label:"×",title:"Remove",className:"remove",append:!0},b);var c=this,d=''+b.label+"",e=function(a,b){var c=a.search(/(<\/[^>]+>\s*)$/);return a.substring(0,c)+b+a.substring(c)};this.setup=function(){var f=c.setup;return function(){if(b.append){var g=c.settings.render.item;c.settings.render.item=function(){return e(g.apply(this,arguments),d)}}f.apply(this,arguments),this.$control.on("click","."+b.className,function(b){if(b.preventDefault(),!c.isLocked){var d=a(b.currentTarget).parent();c.setActiveItem(d),c.deleteSelection()&&c.setCaret(c.items.length)}})}}()}}),L.define("restore_on_backspace",function(a){var b=this;a.text=a.text||function(a){return a[this.settings.labelField]},this.onKeyDown=function(){var c=b.onKeyDown;return function(b){var d,e;return b.keyCode===p&&""===this.$control_input.val()&&!this.$activeItems.length&&(d=this.caretPos-1,d>=0&&d Date: Sat, 27 Feb 2016 11:55:54 +0800 Subject: [PATCH 042/180] Update LC --- xadmin/locale/de_DE/LC_MESSAGES/django.mo | Bin 16279 -> 16279 bytes xadmin/locale/de_DE/LC_MESSAGES/django.po | 179 ++++++++------ xadmin/locale/en/LC_MESSAGES/django.mo | Bin 414 -> 414 bytes xadmin/locale/en/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/es_MX/LC_MESSAGES/django.mo | Bin 19468 -> 19468 bytes xadmin/locale/es_MX/LC_MESSAGES/django.po | 179 ++++++++------ xadmin/locale/eu/LC_MESSAGES/django.mo | Bin 19017 -> 19017 bytes xadmin/locale/eu/LC_MESSAGES/django.po | 179 ++++++++------ xadmin/locale/id_ID/LC_MESSAGES/django.mo | Bin 480 -> 480 bytes xadmin/locale/id_ID/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/ja/LC_MESSAGES/django.mo | Bin 460 -> 460 bytes xadmin/locale/ja/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/lt/LC_MESSAGES/django.mo | Bin 532 -> 532 bytes xadmin/locale/lt/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/nl_NL/LC_MESSAGES/django.mo | Bin 484 -> 484 bytes xadmin/locale/nl_NL/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/pl/LC_MESSAGES/django.mo | Bin 21956 -> 21876 bytes xadmin/locale/pl/LC_MESSAGES/django.po | 284 ++++++++-------------- xadmin/locale/pt_BR/LC_MESSAGES/django.mo | Bin 20577 -> 20577 bytes xadmin/locale/pt_BR/LC_MESSAGES/django.po | 179 ++++++++------ xadmin/locale/ru_RU/LC_MESSAGES/django.mo | Bin 6741 -> 6741 bytes xadmin/locale/ru_RU/LC_MESSAGES/django.po | 178 ++++++++------ xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 19541 -> 19576 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 9 +- 24 files changed, 1085 insertions(+), 992 deletions(-) diff --git a/xadmin/locale/de_DE/LC_MESSAGES/django.mo b/xadmin/locale/de_DE/LC_MESSAGES/django.mo index 823faffb04ab0c0a40223fc1da866ec6bb5baf21..2c5c369dac80e2ecbe53841beb6a9cb5df4bd6aa 100644 GIT binary patch delta 26 icmbPUKfQj#E;U{=T>~RsBXb2qLn~9`&BxU)NB{tSK?u\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/xadmin/language/de_DE/)\n" @@ -20,47 +20,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "Alle" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "Ja" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "Nein" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "Unbekannt" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "Beliebiges Datum" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "Hat ein Datum" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "Hat kein Datum" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "Heute" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "Letzten 7 Tage" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "Diesen Monat" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "Dieses Jahr" @@ -97,7 +101,7 @@ msgstr "Abfrage String" msgid "Is Shared" msgstr "Wird geteilt" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "Lesezeichen" @@ -141,42 +145,38 @@ msgstr "Benutzer Widget" msgid "User Widgets" msgstr "Benutzer Widgets" -#: widgets.py:48 -msgid "Now" -msgstr "Jetzt" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Lösche ausgewählte %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Erfolgreich gelöscht %(count)d %(items)s." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "Kann nicht gelöscht werden %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ausgewählt" msgstr[1] "Alle %(total_count)s ausgewählt" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 von %(cnt)s ausgewählt" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -246,20 +246,20 @@ msgstr "Status" msgid "Permission Name" msgstr "Berechtigungen" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "Passwort ändern" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Passwort ändern: %s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Passwort erfolgreich geändert." -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -274,12 +274,12 @@ msgstr "Änderung des Feldes" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "Anpassung aller gewählten %(verbose_name_plural)s" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "Es wurden %(count)d %(items)s erfolgreich geändert." -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -288,7 +288,7 @@ msgstr "" msgid "bookmark" msgstr "Als Lesezeichen abspeichern" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -296,7 +296,7 @@ msgstr "" msgid "Show models simple chart." msgstr "Einfaches Diagramm der Modelle anzeigen." -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "%s Diagramme" @@ -344,27 +344,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "Einzelheiten von %s" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "Eingabe %s" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s bezeichnetes Objekt mit dem Primärschlüssel %(key)r existiert nicht." -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "Seite" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "Fehlerhaftes Filtern: %s" @@ -401,7 +401,7 @@ msgstr "Thumbnails" msgid "Forgotten your password or username?" msgstr "Haben Sie Ihr Passwort oder den Benutzernamen vergessen?" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "Erstelle %s neu" @@ -410,11 +410,17 @@ msgstr "Erstelle %s neu" msgid "Related Objects" msgstr "Abhängige Objekte" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "Suche %s" +#: plugins/relfield.py:67 +#, fuzzy, python-format +#| msgid "Select Date" +msgid "Select %s" +msgstr "Datum wählen" + #: plugins/themes.py:47 msgid "Default" msgstr "Standard" @@ -431,8 +437,8 @@ msgstr "Bootstrap2" msgid "Bootstrap 2.x theme" msgstr "Bootstrap 2.x Thema" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "Hinzufügen %s" @@ -520,9 +526,10 @@ msgstr "Seite konnte nicht gefunden werden" msgid "We're sorry, but the requested page could not be found." msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden." -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -533,7 +540,7 @@ msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werde #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Startseite" @@ -553,18 +560,6 @@ msgstr "Server Fehler (500)" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "Es ist ein Fehler aufgetreten. Der Siteadmin wurde via E-Mail informiert und wird sich in Kürze um die Behebung des Fehlers kümmern. Wir danken für Ihre Geduld." -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "Willkommen," - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Abmelden" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "Sie haben nicht die notwendige Berechtigung etwas zu ändern." - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -666,11 +661,24 @@ msgstr "Geben Sie Ihr neues Passwort ein." msgid "Enter a new password for the user %(username)s." msgstr "Vergeben Sie ein neues Passwort für den Benutzer %(username)s." +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "Willkommen," + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Abmelden" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "Sie haben nicht die notwendige Berechtigung etwas zu ändern." + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "Themeneinstellungen" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -696,7 +704,7 @@ msgstr "Nächstes" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "Speichern" @@ -756,26 +764,27 @@ msgstr "Diagramme" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "Exportieren" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "Export mit Tabellenkopf." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "Exportieren mit Formatierung." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "Komplette Daten exportieren." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "Schließen" @@ -885,7 +894,7 @@ msgid "Choose" msgstr "Wähle" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "Entferne" @@ -907,7 +916,7 @@ msgstr "Alles anzeigen" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "Speichern..." @@ -1147,18 +1156,22 @@ msgstr "" msgid "Quick Add" msgstr "Schnelles Hinzufügen" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "Widget Optionen" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "Änderungen speichern" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "Widget ID" @@ -1167,39 +1180,39 @@ msgstr "Widget ID" msgid "Widget Title" msgstr "Widget Titel" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "Html Inhalt" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "Zielmodell" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "Schnellauswahlbutton Widget, zum schnellen Öffnen einer beliebigen Seite." -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "Schnellauswahl Buttons" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "Beliebige Objektliste Widget." -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "Fügen Sie ein beliebiges Modell Objekt Widget hinzu." -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "Armaturentafel" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "%s Armaturentafel" @@ -1209,7 +1222,7 @@ msgstr "%s Armaturentafel" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "Andere Felder" @@ -1218,26 +1231,26 @@ msgstr "Andere Felder" msgid "%s Detail" msgstr "%s Einzelheiten" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "Sie können es trotzdem nochmals bearbeiten." -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "Sie können unten ein weiteres %s hinzufügen." -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Ändern %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1271,3 +1284,7 @@ msgstr "Sortierung abbrechen" #: views/website.py:16 msgid "Main Dashboard" msgstr "Hauptübersicht" + +#: widgets.py:48 +msgid "Now" +msgstr "Jetzt" diff --git a/xadmin/locale/en/LC_MESSAGES/django.mo b/xadmin/locale/en/LC_MESSAGES/django.mo index 8b93a210452d564fa2f3727bab1859bfaba1289c..47822d849899ae09e279d9725c86af4b651cdc3c 100644 GIT binary patch delta 24 fcmbQoJdb%o7q6MFfsw9}xq_jgm8tQ@>FkUEQ$z+i delta 24 fcmbQoJdb%o7q5w~fuXLUfr6odm9gQ*>FkUEQk@1V diff --git a/xadmin/locale/en/LC_MESSAGES/django.po b/xadmin/locale/en/LC_MESSAGES/django.po index b9e77c1c7..4fd99de82 100644 --- a/xadmin/locale/en/LC_MESSAGES/django.po +++ b/xadmin/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,47 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=1;\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "" @@ -95,7 +99,7 @@ msgstr "" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "" @@ -139,42 +143,38 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -243,21 +243,21 @@ msgstr "" msgid "Permission Name" msgstr "" -#: plugins/auth.py:159 +#: plugins/auth.py:167 #, fuzzy msgid "Change Password" msgstr "Changed Password" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -272,12 +272,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -294,7 +294,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -340,27 +340,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -397,7 +397,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -406,11 +406,16 @@ msgstr "" msgid "Related Objects" msgstr "" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -427,8 +432,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "" @@ -516,9 +521,10 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -529,7 +535,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "" @@ -549,18 +555,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -662,11 +656,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -692,7 +699,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -752,26 +759,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -881,7 +889,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -903,7 +911,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1142,18 +1150,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1162,39 +1174,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1204,7 +1216,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1213,26 +1225,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1266,3 +1278,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "" diff --git a/xadmin/locale/es_MX/LC_MESSAGES/django.mo b/xadmin/locale/es_MX/LC_MESSAGES/django.mo index 4aed4ac37ff89c2bfcc69f22ec74380524504db9..34f3b04b09154dc68f56dfe5e3f16724bd940fe8 100644 GIT binary patch delta 28 jcmeB~!Pql{al=|2UNc<-BV8kN1w%tCQ{&CMbb{mog1QK5 delta 28 jcmeB~!Pql{al=|2UK3pdLtR4y1w#WXW5dn6bb{mof&&Oz diff --git a/xadmin/locale/es_MX/LC_MESSAGES/django.po b/xadmin/locale/es_MX/LC_MESSAGES/django.po index 926e94116..e983f586d 100644 --- a/xadmin/locale/es_MX/LC_MESSAGES/django.po +++ b/xadmin/locale/es_MX/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-05-12 18:45+0000\n" "Last-Translator: sacrac \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/xadmin/language/es_MX/)\n" @@ -24,49 +24,53 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "Todo" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "Sí" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "No" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "Desconocido" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "Cualquier fecha" -#: filters.py:266 +#: filters.py:267 #, fuzzy msgid "Has date" msgstr "Cualquier fecha" -#: filters.py:269 +#: filters.py:270 #, fuzzy msgid "Has no date" msgstr "Cualquier fecha" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "Hoy" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "Pasados ​​7 días" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "Este mes" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "Este año" @@ -103,7 +107,7 @@ msgstr "Cadena de consulta" msgid "Is Shared" msgstr "Es compartido" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "Marcador" @@ -147,42 +151,38 @@ msgstr "Widget del Usuario" msgid "User Widgets" msgstr "Widgets del Usuario" -#: widgets.py:48 -msgid "Now" -msgstr "Ahora" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Borrar selección %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Correctamente eliminado %(count)d %(items)s." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "No se puede eliminar %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Esta seguro?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionados" msgstr[1] "Todos los %(total_count)s seleccionados" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionado" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "Los articulos deben de ser seleccionados en orden para realizar la acción. No existen artículos que han cambiado" @@ -252,21 +252,21 @@ msgstr "Estados" msgid "Permission Name" msgstr "Permisos" -#: plugins/auth.py:159 +#: plugins/auth.py:167 #, fuzzy msgid "Change Password" msgstr "Cambiar Contraseña" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Contraseña cambiada correctamente" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -282,12 +282,12 @@ msgstr "Historial de cambios: %s" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "Cambio de grupo seleccionado %(verbose_name_plural)s" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, fuzzy, python-format msgid "Successfully change %(count)d %(items)s." msgstr "Correctamente eliminado %(count)d %(items)s." -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, fuzzy, python-format msgid "Batch change %s" msgstr "Cambiar %s" @@ -297,7 +297,7 @@ msgstr "Cambiar %s" msgid "bookmark" msgstr "Marcador" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "Widget de marcador, puede mostrar datos de la lista de favoritos del usuario en el widget." @@ -305,7 +305,7 @@ msgstr "Widget de marcador, puede mostrar datos de la lista de favoritos del usu msgid "Show models simple chart." msgstr "Mostrar simple grafos para los modelos" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "%s Graficos" @@ -353,27 +353,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "Detalles de %s" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "Entre %s" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s el objeto con la llave primaria %(key)r no existe." -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "Hoja" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -410,7 +410,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "¿Olvidó su contraseña o nombre de usuario?" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -419,11 +419,17 @@ msgstr "" msgid "Related Objects" msgstr "Objetos relacionados" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "Buscar %s" +#: plugins/relfield.py:67 +#, fuzzy, python-format +#| msgid "Select Date" +msgid "Select %s" +msgstr "Seleccionar Fecha" + #: plugins/themes.py:47 #, fuzzy msgid "Default" @@ -443,8 +449,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "Tema bootstrap por defecto" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "Añadir %s" @@ -532,9 +538,10 @@ msgstr "Pagina no encontrada" msgid "We're sorry, but the requested page could not be found." msgstr "Lo sentimos pero la pagina que usted solicita no se encuentra." -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -545,7 +552,7 @@ msgstr "Lo sentimos pero la pagina que usted solicita no se encuentra." #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Inicio" @@ -565,18 +572,6 @@ msgstr "Error en el servidor (500)" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "Ha habido un error. Se nos ha informado a los administradores del sitio a través de un correo electrónico y debe repararse en la breve. Gracias por su paciencia." -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "Bienvenidos," - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Salir" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "No tiene permiso para editar nada. " - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -678,11 +673,24 @@ msgstr "Ingresa una nueva contraseña" msgid "Enter a new password for the user %(username)s." msgstr "Introduzca una nueva contraseña para el usuario %(username)s" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "Bienvenidos," + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Salir" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "No tiene permiso para editar nada. " + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "Temas" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -708,7 +716,7 @@ msgstr "Próximo paso" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "Guardar" @@ -768,26 +776,27 @@ msgstr "Graficos" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "Exportar" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "Exportar con la cabecera de la tabla." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "Exportar con formato" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "Exportar todos los datos." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "Cerrar" @@ -897,7 +906,7 @@ msgid "Choose" msgstr "Elegir" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "Eliminar" @@ -919,7 +928,7 @@ msgstr "Mostrar todos" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1162,18 +1171,22 @@ msgstr "Agregado exitosa mente, presiona edit para edit msgid "Quick Add" msgstr "Agregar rápidamente." -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "Opciones del Widget" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "Guardar cambios" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "ID del Widget" @@ -1182,39 +1195,39 @@ msgstr "ID del Widget" msgid "Widget Title" msgstr "Titulo del Widget" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "Contenido html del Widget, puede escribir cualquier contenido del widget." -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "Contenido HTML" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "Modelo objeto" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "botón rapido del widget, abrir rápidamente cualquier página." -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "Botones rapidos" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "Cualquier objeto listado en el widget" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "Añadir cualquier modelo de objeto al Widget." -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "Panel de control" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, fuzzy, python-format msgid "%s Dashboard" msgstr "Panel de control" @@ -1224,7 +1237,7 @@ msgstr "Panel de control" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "El %(name)s \"%(obj)s\" fue eliminado exitosa mente." -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "Otros campos" @@ -1233,26 +1246,26 @@ msgstr "Otros campos" msgid "%s Detail" msgstr "%s Detalles" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "El %(name)s \"%(obj)s\" fue agregado exitosa mente." -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "Puedes editarlo de nuevo abajo." -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "Puedes agregar otro %s debajo." -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Cambiar %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "El %(name)s \"%(obj)s\" fue editado exitosa mente." @@ -1287,6 +1300,10 @@ msgstr "Cancelar ordenación" msgid "Main Dashboard" msgstr "Dashboard principal." +#: widgets.py:48 +msgid "Now" +msgstr "Ahora" + #~ msgid "Add Other %s" #~ msgstr "Añadir otro %s" diff --git a/xadmin/locale/eu/LC_MESSAGES/django.mo b/xadmin/locale/eu/LC_MESSAGES/django.mo index 447238977cf3a1125b1f789b005c2d07d7a33443..9e6fb3489e7d2a3a4bba24a4a9aea5511704a982 100644 GIT binary patch delta 28 kcmX>(h4JJR#tmn6c+GSTjC7666$}lnOpQ0+(#e+v0FmbjHvj+t delta 28 kcmX>(h4JJR#tmn6cujN-40R0+6buclj14#6(#e+v0Ff{WCjbBd diff --git a/xadmin/locale/eu/LC_MESSAGES/django.po b/xadmin/locale/eu/LC_MESSAGES/django.po index 49534a164..7bfa3f193 100644 --- a/xadmin/locale/eu/LC_MESSAGES/django.po +++ b/xadmin/locale/eu/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Basque (http://www.transifex.com/projects/p/xadmin/language/eu/)\n" @@ -18,47 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "Guztia" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "Bai" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "Ez" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "Ezezaguna" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "Edozein data" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "Gaur" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "Duela 7 egun" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "Hilabete hau" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "Urte hau" @@ -95,7 +99,7 @@ msgstr "Kontsulta Katea" msgid "Is Shared" msgstr "Partekatua da." -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "Laster-marketara gehitu" @@ -139,42 +143,38 @@ msgstr "Erabiltzaile Widgeta" msgid "User Widgets" msgstr "Erabiltzaile Widgetak" -#: widgets.py:48 -msgid "Now" -msgstr "Orain" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Aukeratutako %(verbose_name_plural)s ezabatu" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Aukeratutako %(count)d %(items)s arrakastaz ezabatuak." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "Ezin izan da %(name)s ezabatu" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Ziur al zaude?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s aukeratua" msgstr[1] "%(total_count)s guztiak aukeratuak" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)stik 0 aukeratuak" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "Elementuren bat aukeratzea beharrezkoa da ekintza bat burutzeko. Ez da elementurik aldatu." @@ -244,20 +244,20 @@ msgstr "Egoera" msgid "Permission Name" msgstr "Baimenak" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "Pasahitza Aldatu" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Pasahitza aldatu: %s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Pasahitza arrakastaz aldatua." -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -272,12 +272,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "Sorta moduko Aldaketa aukeratua %(verbose_name_plural)s" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "Laster-marken Widgeta, erabiltzailearen laster-marka zerrenda widgetean erakutsi dezake." @@ -294,7 +294,7 @@ msgstr "Laster-marken Widgeta, erabiltzailearen laster-marka zerrenda widgetean msgid "Show models simple chart." msgstr "Erabili modeluen diagrama sinplea." -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "%s Diagrama" @@ -342,27 +342,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "%sren xehetasunak" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "Sartu %s" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Ez da %(key)r eremua nagusitzat duen %(name)srik." -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "Xafla" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -399,7 +399,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Zure pasahitza edo erabiltzailea ahaztu duzu?" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -408,11 +408,17 @@ msgstr "" msgid "Related Objects" msgstr "Erlazionatutako Objetuak" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "Bilatu %s" +#: plugins/relfield.py:67 +#, fuzzy, python-format +#| msgid "Select Date" +msgid "Select %s" +msgstr "Data Aukeratu" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -429,8 +435,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "%s gehitu" @@ -518,9 +524,10 @@ msgstr "Orria ez da aurkitu" msgid "We're sorry, but the requested page could not be found." msgstr "Sentitzen dugu baina eskatutako orria ezin izan da aurkitu." -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -531,7 +538,7 @@ msgstr "Sentitzen dugu baina eskatutako orria ezin izan da aurkitu." #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Hasiera" @@ -551,18 +558,6 @@ msgstr "Zerbitzariaren errorea " msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "Errore bat egon da. Eposta bidez bidali zaio webgunearen kudeatzaileari eta laister konpondu beharko litzake. Milesker zure pazientziagatik." -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "Ongietorri," - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Saioa amaitu" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "Ez daukazu ezer editatzeko baimenik." - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -664,11 +659,24 @@ msgstr "Zure pasahitz berria sartu." msgid "Enter a new password for the user %(username)s." msgstr "%(username)s erabiltzailearentzat pasahitz berri bat sartu." +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "Ongietorri," + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Saioa amaitu" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "Ez daukazu ezer editatzeko baimenik." + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "Itsura-gaiak" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -694,7 +702,7 @@ msgstr "Ondo pausua" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "Gorde" @@ -754,26 +762,27 @@ msgstr "Diagramak" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "Esportatu" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "Esportatu taularen goiburuarekin." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "Formatuarekin esportatu." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "Data guztiak esportatu." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "Itxi" @@ -883,7 +892,7 @@ msgid "Choose" msgstr "Aukeratu" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "Ezabatu" @@ -905,7 +914,7 @@ msgstr "Guztia erakutsi" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1144,18 +1153,22 @@ msgstr "Gehitze arrakastatsua, klikatu editatu editatzek msgid "Quick Add" msgstr "Gehitze Azkarra" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "Widget Aukerak" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "Aldaketak gorde" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "Widget IDa" @@ -1164,39 +1177,39 @@ msgstr "Widget IDa" msgid "Widget Title" msgstr "Widget Izenburua" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "Html Eduki Widgeta, edozein html eduki idatzi daiteke widgetan." -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "Html Edukia" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "Helburu den Modelua" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "Botoi azkarra Widgeta, edozein orri azkar ireki." -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "Botoi Azkarrak" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "Edozein Objetu zerrenda Widgeta." -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "Edozein objetu gehitu Widgeta." -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "Arbela" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1206,7 +1219,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "\"%(obj)s\" %(name)sa arrakastaz ezabatua izan da." -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "Beste Eremuak" @@ -1215,26 +1228,26 @@ msgstr "Beste Eremuak" msgid "%s Detail" msgstr "%s Xehetasunak" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "\"%(obj)s\" %(name)sa arrakastaz gehitua izan da." -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "Behean editatu dezakezu berriro." -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "Behean beste %s bat gehitu dezakezu." -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Aldaketa %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "\"%(obj)s\" %(name)sa arrakastaz gehitua izan da." @@ -1268,3 +1281,7 @@ msgstr "Ezeztatu Ordenaketa" #: views/website.py:16 msgid "Main Dashboard" msgstr "Arbela Nagusia" + +#: widgets.py:48 +msgid "Now" +msgstr "Orain" diff --git a/xadmin/locale/id_ID/LC_MESSAGES/django.mo b/xadmin/locale/id_ID/LC_MESSAGES/django.mo index be9342ad506ed074158e526d06a9bdd95d102563..f1de6064d259faceea4b28f2449a307b2b53ece1 100644 GIT binary patch delta 24 fcmaFB{D65v8?TwJfsw9}xq_jgm8tQ@$-ayLUsMMB delta 24 fcmaFB{D65v8?TA3fuXLUfr6odm9gQ*$-ayLUabb} diff --git a/xadmin/locale/id_ID/LC_MESSAGES/django.po b/xadmin/locale/id_ID/LC_MESSAGES/django.po index bdf15a7fe..1550f73ba 100644 --- a/xadmin/locale/id_ID/LC_MESSAGES/django.po +++ b/xadmin/locale/id_ID/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/xadmin/language/id_ID/)\n" @@ -17,47 +17,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "" @@ -94,7 +98,7 @@ msgstr "" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "" @@ -138,41 +142,37 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -241,20 +241,20 @@ msgstr "" msgid "Permission Name" msgstr "" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -269,12 +269,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -291,7 +291,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -333,27 +333,27 @@ msgid "1 comment was successfully %(action)s." msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -390,7 +390,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -399,11 +399,16 @@ msgstr "" msgid "Related Objects" msgstr "" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -420,8 +425,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "" @@ -509,9 +514,10 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -522,7 +528,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "" @@ -542,18 +548,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -654,11 +648,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -684,7 +691,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -744,26 +751,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -873,7 +881,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -895,7 +903,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1133,18 +1141,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1153,39 +1165,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1195,7 +1207,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1204,26 +1216,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1257,3 +1269,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "" diff --git a/xadmin/locale/ja/LC_MESSAGES/django.mo b/xadmin/locale/ja/LC_MESSAGES/django.mo index 6e431fe54659fa970b881b5d49c2622911509ba6..8547086cf949eeed7b410888118d1fed5c55424f 100644 GIT binary patch delta 24 fcmX@Ze1>^K8?TwJfsw9}xq_jgm8tQ@$(D=&Ta*UB delta 24 fcmX@Ze1>^K8?TA3fuXLUfr6odm9gQ*$(D=&TI~j} diff --git a/xadmin/locale/ja/LC_MESSAGES/django.po b/xadmin/locale/ja/LC_MESSAGES/django.po index 679989292..60d664494 100644 --- a/xadmin/locale/ja/LC_MESSAGES/django.po +++ b/xadmin/locale/ja/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/xadmin/language/ja/)\n" @@ -17,47 +17,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "" @@ -94,7 +98,7 @@ msgstr "" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "" @@ -138,41 +142,37 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -241,20 +241,20 @@ msgstr "" msgid "Permission Name" msgstr "" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -269,12 +269,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -291,7 +291,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -333,27 +333,27 @@ msgid "1 comment was successfully %(action)s." msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -390,7 +390,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -399,11 +399,16 @@ msgstr "" msgid "Related Objects" msgstr "" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -420,8 +425,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "" @@ -509,9 +514,10 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -522,7 +528,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "" @@ -542,18 +548,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -654,11 +648,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -684,7 +691,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -744,26 +751,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -873,7 +881,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -895,7 +903,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1133,18 +1141,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1153,39 +1165,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1195,7 +1207,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1204,26 +1216,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1257,3 +1269,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "" diff --git a/xadmin/locale/lt/LC_MESSAGES/django.mo b/xadmin/locale/lt/LC_MESSAGES/django.mo index 9a7add4cdd147292c5aa04f241db3b8278be0a2a..fb2acc120b3003d23f53c6f8a1c8c9e2754e9aa8 100644 GIT binary patch delta 24 fcmbQjGKFPA8?TwJfsw9}xq_jgm8tQ@$&HKvQa}co delta 24 fcmbQjGKFPA8?TA3fuXLUfr6odm9gQ*$&HKvQJDsb diff --git a/xadmin/locale/lt/LC_MESSAGES/django.po b/xadmin/locale/lt/LC_MESSAGES/django.po index 4fe768a5e..c2f89d55a 100644 --- a/xadmin/locale/lt/LC_MESSAGES/django.po +++ b/xadmin/locale/lt/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/xadmin/language/lt/)\n" @@ -17,47 +17,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "" @@ -94,7 +98,7 @@ msgstr "" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "" @@ -138,30 +142,26 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -169,12 +169,12 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -243,20 +243,20 @@ msgstr "" msgid "Permission Name" msgstr "" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -271,12 +271,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -293,7 +293,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -343,27 +343,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -400,7 +400,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -409,11 +409,16 @@ msgstr "" msgid "Related Objects" msgstr "" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -430,8 +435,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "" @@ -519,9 +524,10 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -532,7 +538,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "" @@ -552,18 +558,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -666,11 +660,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -696,7 +703,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -756,26 +763,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -885,7 +893,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -907,7 +915,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1147,18 +1155,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1167,39 +1179,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1209,7 +1221,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1218,26 +1230,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1271,3 +1283,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "" diff --git a/xadmin/locale/nl_NL/LC_MESSAGES/django.mo b/xadmin/locale/nl_NL/LC_MESSAGES/django.mo index 63ffa4ce8109410043910a039fd538c5addc97a9..e167642331a55828632780754d0521d93970da5b 100644 GIT binary patch delta 24 fcmaFD{DgTz8?TwJfsw9}xq_jgm8tQ@$$^XjU=#-j delta 24 fcmaFD{DgTz8?TA3fuXLUfr6odm9gQ*$$^XjUu_2W diff --git a/xadmin/locale/nl_NL/LC_MESSAGES/django.po b/xadmin/locale/nl_NL/LC_MESSAGES/django.po index fa4a3fbcf..e6474fa2c 100644 --- a/xadmin/locale/nl_NL/LC_MESSAGES/django.po +++ b/xadmin/locale/nl_NL/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/xadmin/language/nl_NL/)\n" @@ -17,47 +17,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "" @@ -94,7 +98,7 @@ msgstr "" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "" @@ -138,42 +142,38 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "" @@ -242,20 +242,20 @@ msgstr "" msgid "Permission Name" msgstr "" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -270,12 +270,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -284,7 +284,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -292,7 +292,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -338,27 +338,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -395,7 +395,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -404,11 +404,16 @@ msgstr "" msgid "Related Objects" msgstr "" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -425,8 +430,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "" @@ -514,9 +519,10 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -527,7 +533,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "" @@ -547,18 +553,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -660,11 +654,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -690,7 +697,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -750,26 +757,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -879,7 +887,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -901,7 +909,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1140,18 +1148,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1160,39 +1172,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1202,7 +1214,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1211,26 +1223,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1264,3 +1276,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "" diff --git a/xadmin/locale/pl/LC_MESSAGES/django.mo b/xadmin/locale/pl/LC_MESSAGES/django.mo index 2d3013bf6d99736d6369489c25f7d3f43a048913..c108e84517246d80f21be3473908b609f160624c 100644 GIT binary patch delta 6093 zcmZA534Bdg0>|+ai9`}vB#0$=gh&yxSYua-rH0s-)>x{PT2g}w<&`3IEFl!N)!16p z5$S#wC4KWkz;ZgL*mslMA%Q*GY=ttd!IzI+` zVlymIsn2Gj#>n|{wdMMMO<9eV5G#K@iCfN4bs3~8L z>Ub?`K$~oRH+G<&i@K4(3e3L_EKNaESOL{R6za|rtu1YPCyb}PA94*dAER&!>il!4 zM|lY~kbLW1yZ-^|y3bGp^RLMK7okw9qBA9BFqnE3)Cl8kdlS?JQ&2P05jF6^wmt%@ zQ=g7n17F~1Jc3&>sS?NHZCrz$UCuxrxR`$*8oVnztF#!Fq+Ss{Gk{tXEm1Sm9(8;l z)ByXT?tB>PxHQxZq+<)5fsDZ%L0$I;)FXa|TExNbD$cX4j=H197>ccIdsoyQ4MBA@ z1vL{H*d6Dg7F9l0#pgH@EAw15&`i|87NMqmCF=Z*cE3BDf=0X>lkgzwPG6!162eur zT3x93w+3pUQ?0X5=VziWyaM$I*I^ONvGv{PP5m%xK*yZA+k8VocX$zXp#t>5Ur`-< zS92~DgxVj9x=;nwag}X*w5=zi2G9`IQ5)1FNVV;wQ2kBD@_PT5P|(!mpzeI1t)D@y zfh(wvZ(|F5gd?zFG#AD7sF{0&^)Z2!$RTDZCgVIz!Skpaii~jv7LCQ}-_)U?9ZgUj zreIC%hJN?~YO&2kEt)LUKsTc=er5L`u=`J;z87vJCcFmo z&zGBNN`o%Y8})h&MvXY#wts|0sV_!dcm-+z>rofphgR0k(f9e#`I=oV_A z_fa$Z2zA^uWKxYkKOkBo^^o5Xx9LjZ9U9WGFTEx5R>Uuo?;}javkcV9`m_KVY^#f3MHXL=w>8JtB zM7@UdaRqKfE#kJk{2IU@)bYbm$ETyNGZm}iJWRnH?brMNj6x;!VcvCMRn!3DQSD7| zF1~?t@DA$E(;GUEWEQI9EUb-7Q8V_n-G3QdQomvA(cGi8X~zXJ}T*2ed!8~6$J%%7k-^5g5VG)AJXpNOL{C5idhfxBqX1rMU8 z?gHu#^HGcPf%OGykrid3sJ#Ss#P>*6R zR>L*O>*+Q}DQEzva1@@$NK9_!d`Az&3Djq!rq++=rPnF|HL!47uY`KvV^EJQ7CT@P z>bMNl8puKoWGxQR`@hHTDBs#Su@>qPG(xR`PUym(r~!;eJ=2NkjdM{0T43wTP>*aC zYBBFc&BQTV&qJMeU3L05H!0}ZKSUpVjyl0B*_oL@tVBJ`))O$AdLz`G_Q$F?0=0-2 zpgP`%dNij|Gw>bizZ>qNZqO@*`5#0fg2H5cAN%4n%%DIu^qk?VJH6wqyP^Rn2M8iLYZ(9Ep0Z#-R33LtW@o z)U(S*Js3VkK@*FyI2`q;-JekCPvNoM z(YqtlL_Nd07xifFp$m(2;-?p*Py@+De!t8i+=$PyIBrPgj~C2AKaA|`+(=c_d3BJt z$!+RW&;gB5i=!oKYTKjkxEtzO_P35lJXVIVj%~J}R5})q;0AV0%3Tvb8s4-T;)~EpuLJcGhy--_`!h%!v{6)oO ze>>o>6j#`Nn^65~bARRN`5eaQ46>N$3q_;UcY5JAg~Co-3AG)rqkfj?JARhk$5Qfa zJNRUbW<7C{AkGORy(w!AmGWX7?J4vj+I-o07dI2lz*X`$@+K)o+7dmQ!Yzn`59eqb z=-^q*TPP=y9Fj*S5^bzu^BK`A--A^9Z62uXC)%o$Ka$#HD|tY)@z;~NLxOFGYSX4~ zPL_ga`-0Cpw!9Lrkm1DZ|IRr?+YNG|@Hq^i@|d(Hdd7Nnw9O-bC*P^U_7QpJDeJY1vjJqh3> zZxTnj3K>kag*ccGu%azbz<-ePw*CVyCzFT|=|{A+BrOPcYyLxekwN4fd7Y?#&sU9# z{~}GuH)JHqC&}bv@;3RAoFZdM3VEM|FyPhrD%nknkisp)7DiaN;a|uJqA&IW5>Nl0 z|1$@kZ5f{nZ27kJx^*KyA&De{j=#nuXVk delta 6183 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 BiPr!C diff --git a/xadmin/locale/pl/LC_MESSAGES/django.po b/xadmin/locale/pl/LC_MESSAGES/django.po index 56bc418d7..6ae7c890e 100644 --- a/xadmin/locale/pl/LC_MESSAGES/django.po +++ b/xadmin/locale/pl/LC_MESSAGES/django.po @@ -7,17 +7,20 @@ msgid "" msgstr "" "Project-Id-Version: django-xadmin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 11:11+0200\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2014-08-12 21:08+0100\n" "Last-Translator: Michał Szpadzik \n" "Language-Team: Polish translators \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.4\n" -"Language: pl\n" + +#: apps.py:10 +msgid "Administration" +msgstr "" #: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" @@ -64,12 +67,8 @@ msgid "This year" msgstr "Ten rok" #: forms.py:10 -msgid "" -"Please enter the correct username and password for a staff account. Note " -"that both fields are case-sensitive." -msgstr "" -"Proszę wpisz prawidłową nazwę użytkownika i hasło do konta. Pamiętaj, że oba " -"pola są wrażliwe na wielkość znaków." +msgid "Please enter the correct username and password for a staff account. Note that both fields are case-sensitive." +msgstr "Proszę wpisz prawidłową nazwę użytkownika i hasło do konta. Pamiętaj, że oba pola są wrażliwe na wielkość znaków." #: forms.py:21 msgid "Please log in again, because your session has expired." @@ -78,9 +77,7 @@ msgstr "Proszę, zaloguj się ponownie, ponieważ Twoja sesja wygasła." #: forms.py:41 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "" -"Twój adres e-mail nie jest Twoją nazwą użytkownika. Zamiast tego spróbuj " -"'%s'." +msgstr "Twój adres e-mail nie jest Twoją nazwą użytkownika. Zamiast tego spróbuj '%s'." #: models.py:47 msgid "Title" @@ -146,30 +143,26 @@ msgstr "Widget użytkownika" msgid "User Widgets" msgstr "Widgety użytkownika" -#: widgets.py:48 -msgid "Now" -msgstr "Teraz" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Usuń zaznaczone %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Z powodzieniem usunięto %(count)d %(items)s." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "Nie można usunąć %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Jesteś pewny ?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -177,18 +170,14 @@ msgstr[0] "%(total_count)s zaznaczony" msgstr[1] "%(total_count)s zaznaczone" msgstr[2] "%(total_count)s zaznaczonych" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 z %(cnt)s zaznaczonych" -#: plugins/actions.py:168 plugins/actions.py:178 -msgid "" -"Items must be selected in order to perform actions on them. No items have " -"been changed." -msgstr "" -"Elementy muszą być zaznaczone, by wykonać akcję na nich. Żaden element nie " -"został zmienony." +#: plugins/actions.py:174 plugins/actions.py:184 +msgid "Items must be selected in order to perform actions on them. No items have been changed." +msgstr "Elementy muszą być zaznaczone, by wykonać akcję na nich. Żaden element nie został zmienony." #: plugins/aggregation.py:14 msgid "Min" @@ -255,20 +244,20 @@ msgstr "Status" msgid "Permission Name" msgstr "Nazwa uprawnienia" -#: plugins/auth.py:161 +#: plugins/auth.py:167 msgid "Change Password" msgstr "Zmień hasło" -#: plugins/auth.py:191 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Zmień hasło: %s" -#: plugins/auth.py:216 plugins/auth.py:248 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Zmiana hasła zakończona powodzieniem" -#: plugins/auth.py:235 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -355,7 +344,7 @@ msgstr[0] "1 komentarz został z powodzeniem %(action)s." msgstr[1] "%(count)s komentarze zostało z powodzeniem %(action)s." msgstr[2] "%(count)s komentarzy zostało z powodzeniem %(action)s." -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "Szczegóły %s" @@ -366,7 +355,7 @@ msgid "Enter %s" msgstr "Wejdz w %s" #: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obiekt %(name)s z kluczem głównym %(key)r nie istnieje." @@ -412,7 +401,7 @@ msgstr "Miniaturki" msgid "Forgotten your password or username?" msgstr "Zapomniałeś swojego hasła lub loginu ?" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "Utwórz nowy %s" @@ -426,6 +415,12 @@ msgstr "Powiązane obiekty" msgid "Search %s" msgstr "Szukaj %s" +#: plugins/relfield.py:67 +#, fuzzy, python-format +#| msgid "Select Date" +msgid "Select %s" +msgstr "Wybierz datę" + #: plugins/themes.py:47 msgid "Default" msgstr "Domyślny" @@ -442,8 +437,8 @@ msgstr "Bootstrap2" msgid "Bootstrap 2.x theme" msgstr "Tematy Bootstrap 2.x" -#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "Dodaj %s" @@ -510,12 +505,8 @@ msgstr "Przywróć %s" #: plugins/xversion.py:456 #, python-format -msgid "" -"The %(model)s \"%(name)s\" was reverted successfully. You may edit it again " -"below." -msgstr "" -"%(model)s \"%(name)s\" został przywrócony z powodzeniem. Możesz edytować go " -"ponownie poniżej." +msgid "The %(model)s \"%(name)s\" was reverted successfully. You may edit it again below." +msgstr "%(model)s \"%(name)s\" został przywrócony z powodzeniem. Możesz edytować go ponownie poniżej." #: plugins/xversion.py:477 #, python-format @@ -524,12 +515,8 @@ msgstr "Odzyskaj %s" #: plugins/xversion.py:493 #, python-format -msgid "" -"The %(model)s \"%(name)s\" was recovered successfully. You may edit it again " -"below." -msgstr "" -"%(model)s \"%(name)s\" został z powodzeniem odzyskany. Możesz edytować go " -"ponownie poniżej." +msgid "The %(model)s \"%(name)s\" was recovered successfully. You may edit it again below." +msgstr "%(model)s \"%(name)s\" został z powodzeniem odzyskany. Możesz edytować go ponownie poniżej." #: templates/xadmin/404.html:4 templates/xadmin/404.html.py:8 msgid "Page not found" @@ -539,9 +526,10 @@ msgstr "Strona nie została odnaleziona" msgid "We're sorry, but the requested page could not be found." msgstr "Przepraszamy, ale żądana strona nie została odnaleziona." -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:54 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -552,7 +540,7 @@ msgstr "Przepraszamy, ale żądana strona nie została odnaleziona." #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:462 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Home" @@ -569,25 +557,8 @@ msgid "Server Error (500)" msgstr "Błąd Serwera (500)" #: templates/xadmin/500.html:16 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Wystąpił błąd. Został zaraportowany do administratorów strony przez e-mail i " -"wkrótce powienien zostać naprawiony. Dziękujemy za wyrozumiałość i " -"cierpliwość." - -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "Witaj, " - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Wyloguj" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "Nie masz uprawnień by edytować cokolwiek." +msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." +msgstr "Wystąpił błąd. Został zaraportowany do administratorów strony przez e-mail i wkrótce powienien zostać naprawiony. Dziękujemy za wyrozumiałość i cierpliwość." #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 @@ -596,8 +567,7 @@ msgstr "Reset hasła zakończony powodzeniem" #: templates/xadmin/auth/password_reset/complete.html:14 msgid "Your password has been set. You may go ahead and log in now." -msgstr "" -"Twoje hasło zostało ustawione. Możesz teraz przejść dalej i zalogować się." +msgstr "Twoje hasło zostało ustawione. Możesz teraz przejść dalej i zalogować się." #: templates/xadmin/auth/password_reset/complete.html:15 msgid "Log in" @@ -608,12 +578,8 @@ msgid "Enter new password" msgstr "Wpisz nowe hasło" #: templates/xadmin/auth/password_reset/confirm.html:17 -msgid "" -"Please enter your new password twice so we can verify you typed it in " -"correctly." -msgstr "" -"Proszę wpisać Twoje nowe hasło dwukrotnie, aby zweryfikować, czy wpisałeś je " -"poprawnie." +msgid "Please enter your new password twice so we can verify you typed it in correctly." +msgstr "Proszę wpisać Twoje nowe hasło dwukrotnie, aby zweryfikować, czy wpisałeś je poprawnie." #: templates/xadmin/auth/password_reset/confirm.html:19 msgid "Change my password" @@ -624,29 +590,17 @@ msgid "Password reset unsuccessful" msgstr "Resetowanie hasło zakończone niepowodzeniem" #: templates/xadmin/auth/password_reset/confirm.html:27 -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a new password reset." -msgstr "" -"Twój link do resetowania hasła jest niepoprawny, prawdopodobnie został już " -"użyty. Proszę, zażądaj nowego linku (wykonaj raz jeszcze reset hasła)." +msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." +msgstr "Twój link do resetowania hasła jest niepoprawny, prawdopodobnie został już użyty. Proszę, zażądaj nowego linku (wykonaj raz jeszcze reset hasła)." #: templates/xadmin/auth/password_reset/done.html:14 -msgid "" -"We've e-mailed you instructions for setting your password to the e-mail " -"address you submitted. You should be receiving it shortly." -msgstr "" -"Wysłaliśmy Ci e-mailem instrukcję ustawienia Twojego hasła na adres, który " -"podałeś. Powinieneś go wkrótce otrzymać." +msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." +msgstr "Wysłaliśmy Ci e-mailem instrukcję ustawienia Twojego hasła na adres, który podałeś. Powinieneś go wkrótce otrzymać." #: templates/xadmin/auth/password_reset/email.html:2 #, python-format -msgid "" -"You're receiving this e-mail because you requested a password reset for your " -"user account at %(site_name)s." -msgstr "" -"Otrzymałeś tego e-maila, ponieważ zarządałeś zresetowania hasła do twojego " -"konta na maszynie %(site_name)s." +msgid "You're receiving this e-mail because you requested a password reset for your user account at %(site_name)s." +msgstr "Otrzymałeś tego e-maila, ponieważ zarządałeś zresetowania hasła do twojego konta na maszynie %(site_name)s." #: templates/xadmin/auth/password_reset/email.html:4 msgid "Please go to the following page and choose a new password:" @@ -670,12 +624,8 @@ msgid "Password reset" msgstr "Reset hasła" #: templates/xadmin/auth/password_reset/form.html:17 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll e-mail " -"instructions for setting a new one." -msgstr "" -"Zapomiałeś swoje hasło ? Wpisz Twój adres e-mail poniżej, a my prześlemy Ci " -"maila z instrukcjami, jak ustawić nowe." +msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." +msgstr "Zapomiałeś swoje hasło ? Wpisz Twój adres e-mail poniżej, a my prześlemy Ci maila z instrukcjami, jak ustawić nowe." #: templates/xadmin/auth/password_reset/form.html:25 msgid "E-mail address:" @@ -686,12 +636,8 @@ msgid "Reset my password" msgstr "Zresetuj moje hasło" #: templates/xadmin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Po pierwsze, wpisz nazwę użytkownika i hasło. Potem bedziesz mógł edytować " -"pozostałe opcje użytkownika." +msgid "First, enter a username and password. Then, you'll be able to edit more user options." +msgstr "Po pierwsze, wpisz nazwę użytkownika i hasło. Potem bedziesz mógł edytować pozostałe opcje użytkownika." #: templates/xadmin/auth/user/add_form.html:8 msgid "Enter a username and password." @@ -716,11 +662,24 @@ msgstr "Wpisz Twoje nowe hasło." msgid "Enter a new password for the user %(username)s." msgstr "Wpisz nowe hasło dla użytkownika %(username)s." +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "Witaj, " + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Wyloguj" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "Nie masz uprawnień by edytować cokolwiek." + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "Tematy" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -746,7 +705,7 @@ msgstr "Następny krok" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "Zapisz" @@ -958,7 +917,7 @@ msgstr "Pokaż wszystkie" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "Zapisuję.." @@ -1007,14 +966,8 @@ msgid "Add Widget" msgstr "Dodaj widget" #: templates/xadmin/views/invalid_setup.html:13 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" -"Coś złego dzieje się z Twoją bazą danych. Upewnij się, że konieczne tabele w " -"Twojej bazie danych zostały skreowane i mogą być czytane przez właściwych " -"użytkowników." +msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." +msgstr "Coś złego dzieje się z Twoją bazą danych. Upewnij się, że konieczne tabele w Twojej bazie danych zostały skreowane i mogą być czytane przez właściwych użytkowników." #: templates/xadmin/views/logged_out.html:16 msgid "Logout Success" @@ -1055,32 +1008,18 @@ msgstr "Edytuj" #: templates/xadmin/views/model_delete_confirm.html:11 #, python-format -msgid "" -"Deleting the %(verbose_name)s '%(escaped_object)s' would result in deleting " -"related objects, but your account doesn't have permission to delete the " -"following types of objects:" -msgstr "" -"Usunięcie %(verbose_name)s '%(escaped_object)s' spowoduje usunięcie " -"powiązanych obiektów, ale Twoje konto nie ma uprawnień do usunięcia " -"następujących typów obiektów:" +msgid "Deleting the %(verbose_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" +msgstr "Usunięcie %(verbose_name)s '%(escaped_object)s' spowoduje usunięcie powiązanych obiektów, ale Twoje konto nie ma uprawnień do usunięcia następujących typów obiektów:" #: templates/xadmin/views/model_delete_confirm.html:19 #, python-format -msgid "" -"Deleting the %(verbose_name)s '%(escaped_object)s' would require deleting " -"the following protected related objects:" -msgstr "" -"Usunięcie %(verbose_name)s '%(escaped_object)s' będzie wymagać usunięcia " -"następujących, chronionych obiektów powiązanych:" +msgid "Deleting the %(verbose_name)s '%(escaped_object)s' would require deleting the following protected related objects:" +msgstr "Usunięcie %(verbose_name)s '%(escaped_object)s' będzie wymagać usunięcia następujących, chronionych obiektów powiązanych:" #: templates/xadmin/views/model_delete_confirm.html:27 #, python-format -msgid "" -"Are you sure you want to delete the %(verbose_name)s \"%(escaped_object)s\"? " -"All of the following related items will be deleted:" -msgstr "" -"Czy jesteś pewien, że chcesz usunąć %(verbose_name)s \"%(escaped_object)s" -"\" ? Wszystkie następujące powiązane obiekty zostaną usunięte:" +msgid "Are you sure you want to delete the %(verbose_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:" +msgstr "Czy jesteś pewien, że chcesz usunąć %(verbose_name)s \"%(escaped_object)s\" ? Wszystkie następujące powiązane obiekty zostaną usunięte:" #: templates/xadmin/views/model_delete_confirm.html:34 #: templates/xadmin/views/model_delete_selected_confirm.html:49 @@ -1098,32 +1037,18 @@ msgstr "Usuń wiele obiektów" #: templates/xadmin/views/model_delete_selected_confirm.html:18 #, python-format -msgid "" -"Deleting the selected %(objects_name)s would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"Usunięcie wybranego obiektów %(objects_name)s będzie skutkowało usunięciem " -"powiązanych obiektów, ale Twoje konto nie posiada uprawnień do usunięcia " -"następujących obiektów:" +msgid "Deleting the selected %(objects_name)s would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" +msgstr "Usunięcie wybranego obiektów %(objects_name)s będzie skutkowało usunięciem powiązanych obiektów, ale Twoje konto nie posiada uprawnień do usunięcia następujących obiektów:" #: templates/xadmin/views/model_delete_selected_confirm.html:26 #, python-format -msgid "" -"Deleting the selected %(objects_name)s would require deleting the following " -"protected related objects:" -msgstr "" -"Usunięcie zaznaczonych obiektów %(objects_name)s będzie wymagało usunięcia " -"następujących zabezpieczonych powiązanych obiektów:" +msgid "Deleting the selected %(objects_name)s would require deleting the following protected related objects:" +msgstr "Usunięcie zaznaczonych obiektów %(objects_name)s będzie wymagało usunięcia następujących zabezpieczonych powiązanych obiektów:" #: templates/xadmin/views/model_delete_selected_confirm.html:34 #, python-format -msgid "" -"Are you sure you want to delete the selected %(objects_name)s? All of the " -"following objects and their related items will be deleted:" -msgstr "" -"Jesteś pewny, że chcesz usunąc zaznaczone obiekty %(objects_name)s ? " -"Wszystkie następujące obiekty i ich powiązania zostaną usunięte:" +msgid "Are you sure you want to delete the selected %(objects_name)s? All of the following objects and their related items will be deleted:" +msgstr "Jesteś pewny, że chcesz usunąc zaznaczone obiekty %(objects_name)s ? Wszystkie następujące obiekty i ich powiązania zostaną usunięte:" #: templates/xadmin/views/model_history.html:26 msgid "Diff" @@ -1147,12 +1072,8 @@ msgid "Diff Select Versions" msgstr "Róznica w wybranych wersjach" #: templates/xadmin/views/model_history.html:58 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"Ten obiekt nie posiada historii zmian. Prawdopodobnie nie został on dodany " -"przez panel administratora." +msgid "This object doesn't have a change history. It probably wasn't added via this admin site." +msgstr "Ten obiekt nie posiada historii zmian. Prawdopodobnie nie został on dodany przez panel administratora." #: templates/xadmin/views/model_list.html:29 #, python-format @@ -1177,10 +1098,8 @@ msgid "Press the recover button below to recover this version of the object." msgstr "Naciśnij przycisk odzyskiwania poniżej, by odzyskać tę wersję obiektu." #: templates/xadmin/views/recover_list.html:19 -msgid "" -"Choose a date from the list below to recover a deleted version of an object." -msgstr "" -"Wybierz datę z poniższej listy aby odzyskać usuniętą wersję danego obiektu." +msgid "Choose a date from the list below to recover a deleted version of an object." +msgstr "Wybierz datę z poniższej listy aby odzyskać usuniętą wersję danego obiektu." #: templates/xadmin/views/recover_list.html:39 msgid "There are no deleted objects to recover." @@ -1220,8 +1139,7 @@ msgstr "Przywróć %(verbose_name)s" #: templates/xadmin/views/revision_form.html:21 msgid "Press the revert button below to revert to this version of the object." -msgstr "" -"Naciśnij przycisk przywracania poniżej, aby przywrócić obiekt do tej wersji." +msgstr "Naciśnij przycisk przywracania poniżej, aby przywrócić obiekt do tej wersji." #: templates/xadmin/views/revision_form.html:27 msgid "Revert this revision" @@ -1247,12 +1165,14 @@ msgstr "Opcje widgetów" msgid "Save changes" msgstr "Zapisz zmiany" -#: views/base.py:443 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" -#: views/base.py:444 -msgid "my-company.inc 2013" +#: views/base.py:445 +#, fuzzy +#| msgid "my-company.inc 2013" +msgid "my-company.inc" msgstr "moja-firma.inc 2013" #: views/dashboard.py:185 @@ -1305,7 +1225,7 @@ msgstr "%s Dashboard" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" został usunięty z powodzeniem." -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "Inne pola" @@ -1314,26 +1234,26 @@ msgstr "Inne pola" msgid "%s Detail" msgstr "Szczegóły %s" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" został dodany z sukcesem." -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "Możesz edytować to powtórnie poniżej." -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "Możesz dodać kolejny %s poniżej." -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Zmień %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" został zmieniony z powodzeniem." @@ -1367,3 +1287,7 @@ msgstr "Anuluj sortowanie" #: views/website.py:16 msgid "Main Dashboard" msgstr "Główny Dashboard" + +#: widgets.py:48 +msgid "Now" +msgstr "Teraz" diff --git a/xadmin/locale/pt_BR/LC_MESSAGES/django.mo b/xadmin/locale/pt_BR/LC_MESSAGES/django.mo index d29992f30f4609d26a196f794f662257ee51de24..469dd28c58a6fecead9553f49f65c706bbd9c722 100644 GIT binary patch delta 28 kcmaF3fbro1#tkzKc+GSTjC7666$}lnOpP}$GuSN;0F@;PZ2$lO delta 28 kcmaF3fbro1#tkzKcujN-40R0+6buclj14z0GuSN;0F-VCT>t<8 diff --git a/xadmin/locale/pt_BR/LC_MESSAGES/django.po b/xadmin/locale/pt_BR/LC_MESSAGES/django.po index 6fca08fae..cd2edbf0a 100644 --- a/xadmin/locale/pt_BR/LC_MESSAGES/django.po +++ b/xadmin/locale/pt_BR/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: gladson \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xadmin/language/pt_BR/)\n" @@ -21,47 +21,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "Tudo" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "Sim" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "Não" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "Desconhecido" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "Qualquer data" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "Tem data" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "Não tem data" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "Hoje" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "Passados 7 dias" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "Este mês" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "Este ano" @@ -98,7 +102,7 @@ msgstr "String de Consulta" msgid "Is Shared" msgstr "É Compartilhada" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "Favorito" @@ -142,42 +146,38 @@ msgstr "Widget do Usuário" msgid "User Widgets" msgstr "Widgets do Usuário" -#: widgets.py:48 -msgid "Now" -msgstr "Agora" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Excluir selecionado %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Excluído com sucesso %(count)d %(items)s." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "Não é possível excluir %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Você tem certeza?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Todos %(total_count)s selecionados" msgstr[1] "Todos %(total_count)s selecionados" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s selecionados" -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "Os itens devem ser selecionados, a fim de executar ações sobre eles. Não há itens alterados." @@ -247,20 +247,20 @@ msgstr "Status" msgid "Permission Name" msgstr "Permissões" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "Alterar Senha" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Alterar senha: %s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Senha alterada com sucesso." -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -275,12 +275,12 @@ msgstr "Alterar este campo" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "Alterar lote selecionado %(verbose_name_plural)s" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "Alterado com sucesso %(count)d %(items)s." -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "Lote alterado %s" @@ -289,7 +289,7 @@ msgstr "Lote alterado %s" msgid "bookmark" msgstr "Favorito" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "Widget de Marcador, pode mostrar a lista de marcadores do usuário no widget" @@ -297,7 +297,7 @@ msgstr "Widget de Marcador, pode mostrar a lista de marcadores do usuário no wi msgid "Show models simple chart." msgstr "Mostrar modelos gráfico simples." -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "%s Gráficos" @@ -345,27 +345,27 @@ msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "Detalhes de %s" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "Entrar %s" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objeto com chave primária %(key)r não existe." -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "Planilha" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "Filtrar erro: %s" @@ -402,7 +402,7 @@ msgstr "Miniaturas" msgid "Forgotten your password or username?" msgstr "Esqueceu seu nome de usuário ou senha?" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "Criar novo %s" @@ -411,11 +411,17 @@ msgstr "Criar novo %s" msgid "Related Objects" msgstr "Objetos Relacionados" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "Pesquisar %s" +#: plugins/relfield.py:67 +#, fuzzy, python-format +#| msgid "Select Date" +msgid "Select %s" +msgstr "Selecionar Data" + #: plugins/themes.py:47 msgid "Default" msgstr "Padrão" @@ -432,8 +438,8 @@ msgstr "Bootstrap2" msgid "Bootstrap 2.x theme" msgstr "Tema Bootstrap 2.x" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "Adicionar %s" @@ -521,9 +527,10 @@ msgstr "Página não encontrada" msgid "We're sorry, but the requested page could not be found." msgstr "Pedimos desculpas, mas a página solicitada não foi encontrada." -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -534,7 +541,7 @@ msgstr "Pedimos desculpas, mas a página solicitada não foi encontrada." #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Início" @@ -554,18 +561,6 @@ msgstr "Erro do Servidor (500)" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "Ocorreu um erro. E foi relatado aos administradores do site via e-mail e deve ser corrigido em breve. Obrigado por sua paciência." -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "Bem-Vindo," - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Sair" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "Você não tem permissão para editar nada." - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -667,11 +662,24 @@ msgstr "Digite sua nova senha." msgid "Enter a new password for the user %(username)s." msgstr "Digite uma nova senha para o usuário %(username)s." +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "Bem-Vindo," + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Sair" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "Você não tem permissão para editar nada." + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "Temas" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -697,7 +705,7 @@ msgstr "Próximo passo" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "Gravar" @@ -757,26 +765,27 @@ msgstr "Gráficos" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "Exportar" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "Exportar com cabeçalho da tabela" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "Exportar com o formato." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "Exportar todos os dados." -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "Fechar" @@ -886,7 +895,7 @@ msgid "Choose" msgstr "Escolher" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "Remover" @@ -908,7 +917,7 @@ msgstr "Mostrar Tudo" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "Salvando..." @@ -1148,18 +1157,22 @@ msgstr "Sucesso na adição, clique editar para editar." msgid "Quick Add" msgstr "Adição Rápida" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "Opções do Widget" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "Gravar alterações" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "Django Xadmin" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "ID do Widget" @@ -1168,39 +1181,39 @@ msgstr "ID do Widget" msgid "Widget Title" msgstr "Título do Widget" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "Widget de Conteúdo HTML, pode-se escrever qualquer conteúdo html no widget." -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "Conteúdo HTML" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "Modelo Alvo" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "Widget de Botão Rápido, abre rapidamente qualquer página." -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "Botões Rápidos" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "Widget de listagem de Qualquer Objeto" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "Widget de adição de qualquer objeto." -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "Painel" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "%s Painel" @@ -1210,7 +1223,7 @@ msgstr "%s Painel" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" excluído(a) com sucesso." -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "Outros Campos" @@ -1219,26 +1232,26 @@ msgstr "Outros Campos" msgid "%s Detail" msgstr "%s Detalhes" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" adicionado(a) com sucesso." -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "Você pode editar novamente abaixo." -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "Você pode adicionar outro(a) %s abaixo." -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Alterar %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" alterado(a) com sucesso." @@ -1272,3 +1285,7 @@ msgstr "Cancelar Classificação" #: views/website.py:16 msgid "Main Dashboard" msgstr "Painel Principal" + +#: widgets.py:48 +msgid "Now" +msgstr "Agora" diff --git a/xadmin/locale/ru_RU/LC_MESSAGES/django.mo b/xadmin/locale/ru_RU/LC_MESSAGES/django.mo index a7f41863bb02577bf59fbb640e8fad08e7878717..4b5b4c218adac6bc09675bfb5b6796e485ff45cd 100644 GIT binary patch delta 26 hcmca=a@AzRcWz!YT>~RsBXb2qLn~9`%`7~Dd;ogT2Xg=b delta 26 hcmca=a@AzRcWz!2T?0d1Ljwgv11n?0%`7~Dd;oeG2V(#L diff --git a/xadmin/locale/ru_RU/LC_MESSAGES/django.po b/xadmin/locale/ru_RU/LC_MESSAGES/django.po index dc2508b5e..0999f34b4 100644 --- a/xadmin/locale/ru_RU/LC_MESSAGES/django.po +++ b/xadmin/locale/ru_RU/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 10:31+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-12-28 19:36+0000\n" "Last-Translator: crazyzubr \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/xadmin/language/ru_RU/)\n" @@ -18,47 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: filters.py:157 filters.py:189 filters.py:401 filters.py:451 +#: apps.py:10 +msgid "Administration" +msgstr "" + +#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 msgid "All" msgstr "Все" -#: filters.py:158 plugins/export.py:117 +#: filters.py:159 plugins/export.py:162 msgid "Yes" msgstr "Да" -#: filters.py:159 plugins/export.py:117 +#: filters.py:160 plugins/export.py:162 msgid "No" msgstr "Нет" -#: filters.py:173 +#: filters.py:174 msgid "Unknown" msgstr "Неизвестно" -#: filters.py:265 +#: filters.py:266 msgid "Any date" msgstr "Любая дата" -#: filters.py:266 +#: filters.py:267 msgid "Has date" msgstr "" -#: filters.py:269 +#: filters.py:270 msgid "Has no date" msgstr "" -#: filters.py:272 widgets.py:30 +#: filters.py:273 widgets.py:30 msgid "Today" msgstr "Сегодня" -#: filters.py:276 +#: filters.py:277 msgid "Past 7 days" msgstr "За последние 7 дней" -#: filters.py:280 +#: filters.py:281 msgid "This month" msgstr "В этом месяце" -#: filters.py:284 +#: filters.py:285 msgid "This year" msgstr "В этом году" @@ -95,7 +99,7 @@ msgstr "Строка запроса" msgid "Is Shared" msgstr "" -#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:177 +#: models.py:65 plugins/bookmark.py:49 plugins/bookmark.py:178 msgid "Bookmark" msgstr "Закладка" @@ -139,30 +143,26 @@ msgstr "" msgid "User Widgets" msgstr "" -#: widgets.py:48 -msgid "Now" -msgstr "Сейчас" - #: plugins/actions.py:54 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Удалить выбранные %(verbose_name_plural)s" -#: plugins/actions.py:67 +#: plugins/actions.py:73 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно удалены %(count)d %(items)s." -#: plugins/actions.py:99 views/delete.py:68 +#: plugins/actions.py:105 views/delete.py:68 #, python-format msgid "Cannot delete %(name)s" msgstr "Не удается удалить %(name)s" -#: plugins/actions.py:101 views/delete.py:71 +#: plugins/actions.py:107 views/delete.py:71 msgid "Are you sure?" msgstr "Вы уверены?" -#: plugins/actions.py:147 +#: plugins/actions.py:153 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -170,12 +170,12 @@ msgstr[0] "Выбран %(total_count)s" msgstr[1] "Выбраны все %(total_count)s" msgstr[2] "Выбраны все %(total_count)s" -#: plugins/actions.py:151 +#: plugins/actions.py:157 #, python-format msgid "0 of %(cnt)s selected" msgstr "Выбрано 0 объектов из %(cnt)s " -#: plugins/actions.py:168 plugins/actions.py:178 +#: plugins/actions.py:174 plugins/actions.py:184 msgid "Items must be selected in order to perform actions on them. No items have been changed." msgstr "Чтобы произвести действия над объектами, необходимо их выбрать. Объекты не были изменены." @@ -245,20 +245,20 @@ msgstr "Статус" msgid "Permission Name" msgstr "Права" -#: plugins/auth.py:159 +#: plugins/auth.py:167 msgid "Change Password" msgstr "Изменить пароль" -#: plugins/auth.py:189 +#: plugins/auth.py:197 #, python-format msgid "Change password: %s" msgstr "Изменить пароль: %s" -#: plugins/auth.py:214 plugins/auth.py:246 +#: plugins/auth.py:222 plugins/auth.py:254 msgid "Password changed successfully." msgstr "Пароль успешно изменен" -#: plugins/auth.py:233 templates/xadmin/auth/user/change_password.html:11 +#: plugins/auth.py:241 templates/xadmin/auth/user/change_password.html:11 #: templates/xadmin/auth/user/change_password.html:22 #: templates/xadmin/auth/user/change_password.html:55 msgid "Change password" @@ -273,12 +273,12 @@ msgstr "" msgid "Batch Change selected %(verbose_name_plural)s" msgstr "" -#: plugins/batch.py:90 +#: plugins/batch.py:88 #, python-format msgid "Successfully change %(count)d %(items)s." msgstr "" -#: plugins/batch.py:138 +#: plugins/batch.py:136 #, python-format msgid "Batch change %s" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "bookmark" msgstr "" -#: plugins/bookmark.py:173 +#: plugins/bookmark.py:174 msgid "Bookmark Widget, can show user's bookmark list data in widget." msgstr "" @@ -295,7 +295,7 @@ msgstr "" msgid "Show models simple chart." msgstr "" -#: plugins/chart.py:49 +#: plugins/chart.py:50 #, python-format msgid "%s Charts" msgstr "" @@ -345,27 +345,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "Детали %s" -#: plugins/editable.py:47 +#: plugins/editable.py:46 #, python-format msgid "Enter %s" msgstr "" -#: plugins/editable.py:74 views/dashboard.py:638 views/delete.py:26 -#: views/detail.py:144 views/edit.py:428 +#: plugins/editable.py:73 views/dashboard.py:645 views/delete.py:26 +#: views/detail.py:144 views/edit.py:438 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: plugins/export.py:87 +#: plugins/export.py:95 plugins/export.py:132 msgid "Sheet" msgstr "Лист" -#: plugins/filters.py:125 +#: plugins/filters.py:132 plugins/quickfilter.py:140 #, python-format msgid "Filtering error: %s" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: plugins/quickform.py:77 +#: plugins/quickform.py:79 #, python-format msgid "Create New %s" msgstr "" @@ -411,11 +411,16 @@ msgstr "" msgid "Related Objects" msgstr "Связанные объекты" -#: plugins/relfield.py:29 plugins/topnav.py:35 +#: plugins/relfield.py:29 plugins/topnav.py:38 #, python-format msgid "Search %s" msgstr "Поиск %s" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "" + #: plugins/themes.py:47 msgid "Default" msgstr "" @@ -432,8 +437,8 @@ msgstr "" msgid "Bootstrap 2.x theme" msgstr "" -#: plugins/topnav.py:58 views/dashboard.py:455 views/edit.py:361 -#: views/edit.py:370 +#: plugins/topnav.py:63 views/dashboard.py:462 views/edit.py:371 +#: views/edit.py:380 #, python-format msgid "Add %s" msgstr "Добавить %s" @@ -521,9 +526,10 @@ msgstr "Страница не найдена" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/xadmin/500.html:7 templates/xadmin/base_site.html:53 +#: templates/xadmin/500.html:7 #: templates/xadmin/auth/user/change_password.html:10 #: templates/xadmin/auth/user/change_password.html:15 +#: templates/xadmin/base_site.html:56 #: templates/xadmin/includes/sitemenu_default.html:7 #: templates/xadmin/views/app_index.html:9 #: templates/xadmin/views/batch_change_form.html:9 @@ -534,7 +540,7 @@ msgstr "" #: templates/xadmin/views/recover_form.html:8 #: templates/xadmin/views/recover_list.html:8 #: templates/xadmin/views/revision_diff.html:8 -#: templates/xadmin/views/revision_form.html:8 views/base.py:448 +#: templates/xadmin/views/revision_form.html:8 views/base.py:463 msgid "Home" msgstr "Главная" @@ -554,18 +560,6 @@ msgstr "" msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/xadmin/base_site.html:19 -msgid "Welcome," -msgstr "" - -#: templates/xadmin/base_site.html:25 -msgid "Log out" -msgstr "Выйти" - -#: templates/xadmin/base_site.html:37 -msgid "You don't have permission to edit anything." -msgstr "" - #: templates/xadmin/auth/password_reset/complete.html:11 #: templates/xadmin/auth/password_reset/done.html:11 msgid "Password reset successful" @@ -668,11 +662,24 @@ msgstr "" msgid "Enter a new password for the user %(username)s." msgstr "" +#: templates/xadmin/base_site.html:21 +msgid "Welcome," +msgstr "" + +#: templates/xadmin/base_site.html:27 +msgid "Log out" +msgstr "Выйти" + +#: templates/xadmin/base_site.html:39 +msgid "You don't have permission to edit anything." +msgstr "" + #: templates/xadmin/blocks/comm.top.theme.html:4 msgid "Themes" msgstr "" #: templates/xadmin/blocks/comm.top.topnav.html:8 +#: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 #: templates/xadmin/filters/fk_search.html:14 @@ -698,7 +705,7 @@ msgstr "" #: templates/xadmin/blocks/model_form.submit_line.wizard.html:31 #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Save" msgstr "" @@ -758,26 +765,27 @@ msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:4 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:8 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:19 -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:44 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:47 msgid "Export" msgstr "" #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:26 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:29 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 msgid "Export with table header." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:32 #: templates/xadmin/blocks/model_list.top_toolbar.exports.html:35 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:38 msgid "Export with format." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:39 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:42 msgid "Export all data." msgstr "" -#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:43 -#: templates/xadmin/widgets/base.html:40 +#: templates/xadmin/blocks/model_list.top_toolbar.exports.html:46 +#: templates/xadmin/widgets/base.html:41 msgid "Close" msgstr "" @@ -887,7 +895,7 @@ msgid "Choose" msgstr "" #: templates/xadmin/forms/transfer.html:19 -#: templates/xadmin/widgets/base.html:39 +#: templates/xadmin/widgets/base.html:40 msgid "Remove" msgstr "" @@ -909,7 +917,7 @@ msgstr "" #: templates/xadmin/includes/submit_line.html:10 #: templates/xadmin/includes/submit_line.html:13 -#: templates/xadmin/views/form.html:30 +#: templates/xadmin/views/form.html:30 templates/xadmin/views/form.html:31 msgid "Saving.." msgstr "" @@ -1149,18 +1157,22 @@ msgstr "" msgid "Quick Add" msgstr "" -#: templates/xadmin/widgets/base.html:30 +#: templates/xadmin/widgets/base.html:31 msgid "Widget Options" msgstr "" -#: templates/xadmin/widgets/base.html:41 +#: templates/xadmin/widgets/base.html:42 msgid "Save changes" msgstr "" -#: views/base.py:430 +#: views/base.py:444 msgid "Django Xadmin" msgstr "" +#: views/base.py:445 +msgid "my-company.inc" +msgstr "" + #: views/dashboard.py:185 msgid "Widget ID" msgstr "" @@ -1169,39 +1181,39 @@ msgstr "" msgid "Widget Title" msgstr "" -#: views/dashboard.py:248 +#: views/dashboard.py:249 msgid "Html Content Widget, can write any html content in widget." msgstr "" -#: views/dashboard.py:251 +#: views/dashboard.py:252 msgid "Html Content" msgstr "" -#: views/dashboard.py:314 +#: views/dashboard.py:315 msgid "Target Model" msgstr "" -#: views/dashboard.py:365 +#: views/dashboard.py:366 msgid "Quick button Widget, quickly open any page." msgstr "" -#: views/dashboard.py:367 +#: views/dashboard.py:368 msgid "Quick Buttons" msgstr "" -#: views/dashboard.py:408 +#: views/dashboard.py:413 msgid "Any Objects list Widget." msgstr "" -#: views/dashboard.py:447 +#: views/dashboard.py:453 msgid "Add any model object Widget." msgstr "" -#: views/dashboard.py:481 +#: views/dashboard.py:488 msgid "Dashboard" msgstr "" -#: views/dashboard.py:622 +#: views/dashboard.py:629 #, python-format msgid "%s Dashboard" msgstr "" @@ -1211,7 +1223,7 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: views/detail.py:172 views/edit.py:199 views/form.py:72 +#: views/detail.py:172 views/edit.py:209 views/form.py:72 msgid "Other Fields" msgstr "" @@ -1220,26 +1232,26 @@ msgstr "" msgid "%s Detail" msgstr "" -#: views/edit.py:394 +#: views/edit.py:404 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: views/edit.py:399 views/edit.py:494 +#: views/edit.py:409 views/edit.py:504 msgid "You may edit it again below." msgstr "" -#: views/edit.py:403 views/edit.py:497 +#: views/edit.py:413 views/edit.py:507 #, python-format msgid "You may add another %s below." msgstr "" -#: views/edit.py:445 +#: views/edit.py:455 #, python-format msgid "Change %s" msgstr "Изменить %s" -#: views/edit.py:490 +#: views/edit.py:500 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" @@ -1273,3 +1285,7 @@ msgstr "" #: views/website.py:16 msgid "Main Dashboard" msgstr "" + +#: widgets.py:48 +msgid "Now" +msgstr "Сейчас" diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index bf053f42f1f17d206b8d7231021aa5181e19daa8..648e21f4d6def80b77d05310f05745a90d0403bd 100644 GIT binary patch delta 5232 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 UYuBYi`;9|$>LhF&UQ`|ZKP$*VbN~PV delta 5213 zcmX}w33yId9>?+XMj|`%W+Ap%qCo^nlL)$`iGApxC|WZ*Dm7|1F_xOw+A=KYMCJe@@6c~DEMXfai)tuVt-OO1}u=zM><|IYjP=X3t&-h0mfo_p>a+*uPi zxh4=g7YzTS+vU*SVo{$(W5Ca=ozt2Vx#B#c2Ehr!bQI zYt;3Zurc1pI+)t1_WY1*Mx!nr?J)+kQH4B&1vmoh;U7>JZbbgLxA~!h_Fx1az~A8! zT!j5oor}lgr~CqCM5H_G#WwdgshG$vV0`=B%g@7pd3}uUewe1hxK1ZEp;_& z;sDF1f}&7)686U?s2dq){nIg|rJGGd6U;;1*$Q*L^}mbR^j9E%+%7>3iDvHn_;QabdEL#PUuqx#pP27D8>GFwo0wAb>(m_dFX zd7Lh$IfG(4Zo}1Bg1yri1K&dxGPs3v;W)Yl>#yB8mX0KxgS9Jw+7s(hE3*l8!7fyR z6ybJ&$^ni$XMXM{BSFZml}zK#FPQ&AIVU?Jw> zL@dRDScO`$+y|V?$H_>Sdk1^s$Jh&l>`2|v2vlKXP~%Rp{#mF!wh%L!->sw(iIu3$ zwI8)fj-e{OjCHZvj=Q%0@mSRNK)RWadW3yY=Z`?WHKS1l%|vbT1(vVIkS5qjBOJG* zD%*)VaUW_4PotLZ7V1uZMBX?T*UrDg_NWOTL`~EUb$$=zj~mDjJ%ZV&>t98^4R5yN z`K#iccHjU;ke|RP`~p=#6-HwXZo|m-{_$O?{=cINIE;~a9I4TrMlNw-nf_ktfEvFu zs*rrG|06Vt>EP?xExdsyx338sp(bjBDl{AQn&zU;D?k>_^+N5D zX{g^BEAV;Tirq1lUnmdj{U1t0OXZ;os6Y+4AN5QRp;qP?s-RO?A1|U-; z>R~|H*Vn`hi(9lGkQ5AN_9#$FUBJ5XZ_1ig{-sVZ(08q)WEw@1s=5i zGst6hmr!3kO}qLQpvE79D)6bUtiJ{xX9uR4vrq%iL+$nzs7?7g>ijqC_-52V@1u7A z0n`L1Q7d@X^6yXuR$~Un@rxuCb3-&rXgrRKa0fnt-FQbP<8svIypI|<@*)4idZ;^V zi<-Cx>iA&P9vETycvQhtEuVuLZvm?C(91N6X{UsQ$7AipIEv$QFda|hT)dC0Xvn?5_peTzXZ{{F!7B4L)NcM0@`AXns0pi3 z1>UgSJ<6Ly9*??ym^lh{{SMXZ4an#v0&=b*OyV$?({&GpFcbz4vc zT}17qtJn~4qt1_KH|cm|RNfMGyrbp4P&fJn>iLxvhx`j>(2+vNT-3m;?1VB@VOvoH z?m|tl&+?D35&7q+oq7{BaAXhv{D#<^JRNmo#i;9lj+$p!h=vCKCFbA+)CC(*1MR^i z`~-Dg6{?^cSO@P~|9w;;u|56c={SeHBWl9U=5}+p8Tx>Rz7;++ui1f=UjBv6P!p%4 zo?SMoz;Vdtaxa+&uoZb^Z{POj0MrdkK`s4a9F1$RuHM0F8rnqKIcuRQa=`7xL0D;d z{l0#GirEac0_m2wH9KK6{rQ#`qHdtKIRv$`&(zBEpGqT|j`=KCZqLVUHZ*fdtPlE}4?h$$p*S!HrX>IhMQki6Z z2z^cw2WngXKcCe+>8(ua5^PvL5IIC57464; z#1SHjJf0|{T~2&UXg{VBcfGQdw7^xbG9_))VRG%qgTz_lr;pxp{(@ZlSMs{LTRta< zaBFv{?cx8Ha2PRz&~M$##C$@Z|CD!a*eX~)wp}1PJ};|tURF*{i|o8^dAa4&bK-*K JOM2Xh{2zo-KNbK0 diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.po b/xadmin/locale/zh_CN/LC_MESSAGES/django.po index 22de0274e..b6a7a9c2e 100644 --- a/xadmin/locale/zh_CN/LC_MESSAGES/django.po +++ b/xadmin/locale/zh_CN/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-22 15:54+0800\n" +"POT-Creation-Date: 2016-02-27 11:53+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xadmin/language/zh_CN/)\n" @@ -335,7 +335,7 @@ msgid "1 comment was successfully %(action)s." msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" -#: plugins/details.py:52 views/list.py:576 +#: plugins/details.py:52 views/list.py:579 #, python-format msgid "Details of %s" msgstr "%s详情" @@ -406,6 +406,11 @@ msgstr "关联数据" msgid "Search %s" msgstr "搜索%s" +#: plugins/relfield.py:67 +#, python-format +msgid "Select %s" +msgstr "选择%s" + #: plugins/themes.py:47 msgid "Default" msgstr "默认" From 8a29ec0c3aaeed8422adced02bd0afee08f89af1 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Sat, 27 Feb 2016 11:57:12 +0800 Subject: [PATCH 043/180] Now, use selectize.js for every select input, and 'fk-select' field style can preload data by Ajax. --- xadmin/plugins/relfield.py | 35 ++++++-- .../static/xadmin/js/xadmin.widget.select.js | 86 +++++++------------ 2 files changed, 56 insertions(+), 65 deletions(-) diff --git a/xadmin/plugins/relfield.py b/xadmin/plugins/relfield.py index 9a5f5e4fb..5a9225f3a 100644 --- a/xadmin/plugins/relfield.py +++ b/xadmin/plugins/relfield.py @@ -1,5 +1,7 @@ from django.db import models +from django.forms.utils import flatatt from django.utils.html import escape, format_html +from django.utils.safestring import mark_safe from django.utils.text import Truncator from django.utils.translation import ugettext as _ from django import forms @@ -8,7 +10,7 @@ from xadmin.util import vendor -class ForeignKeySearchWidget(forms.TextInput): +class ForeignKeySearchWidget(forms.Widget): def __init__(self, rel, admin_view, attrs=None, using=None): self.rel = rel @@ -16,10 +18,8 @@ def __init__(self, rel, admin_view, attrs=None, using=None): self.db = using super(ForeignKeySearchWidget, self).__init__(attrs) - def render(self, name, value, attrs=None): + def build_attrs(self, attrs={}, **kwargs): to_opts = self.rel.to._meta - if attrs is None: - attrs = {} if "class" not in attrs: attrs['class'] = 'select-search' else: @@ -32,10 +32,16 @@ def render(self, name, value, attrs=None): for i in list(self.rel.limit_choices_to): attrs['data-choices'] += "&_p_%s=%s" % (i, self.rel.limit_choices_to[i]) attrs['data-choices'] = format_html(attrs['data-choices']) - if value: - attrs['data-label'] = self.label_for_value(value) - return super(ForeignKeySearchWidget, self).render(name, value, attrs) + return super(ForeignKeySearchWidget, self).build_attrs(attrs, **kwargs) + + def render(self, name, value, attrs=None): + final_attrs = self.build_attrs(attrs, name=name) + output = [format_html('', flatatt(final_attrs))] + if value: + output.append(format_html('', value, self.label_for_value(value))) + output.append('') + return mark_safe('\n'.join(output)) def label_for_value(self, value): key = self.rel.get_related_field().name @@ -50,16 +56,27 @@ def label_for_value(self, value): def media(self): return vendor('select.js', 'select.css', 'xadmin.widget.select.js') +class ForeignKeySelectWidget(ForeignKeySearchWidget): + + def build_attrs(self, attrs={}, **kwargs): + attrs = super(ForeignKeySelectWidget, self).build_attrs(attrs, **kwargs) + if "class" not in attrs: + attrs['class'] = 'select-preload' + else: + attrs['class'] = attrs['class'] + ' select-preload' + attrs['data-placeholder'] = _('Select %s') % self.rel.to._meta.verbose_name + return attrs class RelateFieldPlugin(BaseAdminPlugin): def get_field_style(self, attrs, db_field, style, **kwargs): # search able fk field - if style == 'fk-ajax' and isinstance(db_field, models.ForeignKey): + if style in ('fk-ajax', 'fk-select') and isinstance(db_field, models.ForeignKey): if (db_field.rel.to in self.admin_view.admin_site._registry) and \ self.has_model_perm(db_field.rel.to, 'view'): db = kwargs.get('using') - return dict(attrs or {}, widget=ForeignKeySearchWidget(db_field.rel, self.admin_view, using=db)) + return dict(attrs or {}, \ + widget=(style == 'fk-ajax' and ForeignKeySearchWidget or ForeignKeySelectWidget)(db_field.rel, self.admin_view, using=db)) return attrs site.register_plugin(RelateFieldPlugin, ModelFormAdminView) diff --git a/xadmin/static/xadmin/js/xadmin.widget.select.js b/xadmin/static/xadmin/js/xadmin.widget.select.js index 669b33d91..1dd9a3830 100644 --- a/xadmin/static/xadmin/js/xadmin.widget.select.js +++ b/xadmin/static/xadmin/js/xadmin.widget.select.js @@ -1,64 +1,38 @@ ;(function($){ - // add select2 render - if(!window.__admin_ismobile__){ - $.fn.exform.renders.push(function(f){ - if($.fn.selectize){ - f.find('select:not(.select-search):not([multiple=multiple])').selectize(); - f.find('.select-search').each(function(){ - var $el = $(this); - $el.select2({ - minimumInputLength: 1, - initSelection: function(elem, callback){ - callback({id: elem.val(), '__str__': $el.data('label')}); - }, - ajax: { + // add select render + $.fn.exform.renders.push(function(f){ + if($.fn.selectize){ + f.find('select:not(.select-search):not([multiple=multiple])').selectize(); + f.find('.select-search').each(function(){ + var $el = $(this); + var preload = $el.hasClass('select-preload'); + $el.selectize({ + valueField: 'id', + labelField: '__str__', + searchField: '__str__', + create: false, + maxItems: 1, + preload: preload, + load: function(query, callback) { + if(!preload && !query.length) return callback(); + $.ajax({ url: $el.data('search-url')+$el.data('choices'), dataType: 'json', - data: function (term, page) { - return { - '_q_' : term, - '_cols': 'id.__str__', - 'p': page - 1 - }; + data: { + '_q_' : query, + '_cols': 'id.__str__' }, - results: function (data, page) { - return {results: data.objects, more: data.has_more}; - } - }, - formatResult: function(item){return item['__str__']}, - formatSelection: function(item){return item['__str__']} - }); - }) - }}); - } else { - $.fn.exform.renders.push(function(f){ - if($.fn.select2){ - f.find('.select-search').each(function(){ - var $el = $(this); - $el.select2({ - minimumInputLength: 1, - initSelection: function(elem, callback){ - callback({id: elem.val(), '__str__': $el.data('label')}); - }, - ajax: { - url: $el.data('search-url')+$el.data('choices'), - dataType: 'json', - data: function (term, page) { - return { - '_q_' : term, - '_cols': 'id.__str__', - 'p': page - 1 - }; + type: 'GET', + error: function() { + callback(); }, - results: function (data, page) { - return {results: data.objects, more: data.has_more}; + success: function(res) { + callback(res.objects); } - }, - formatResult: function(item){return item['__str__']}, - formatSelection: function(item){return item['__str__']} - }); - }) - }}); - } + }); + } + }); + }) + }}); })(jQuery) From e5e893a89696bf9e7a885bba2d163537132240ab Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 3 Mar 2016 20:03:41 +0800 Subject: [PATCH 044/180] Update List filter for 'fk-select' . --- xadmin/filters.py | 6 +++++- xadmin/locale/de_DE/LC_MESSAGES/django.po | 16 +++++++++++----- xadmin/locale/en/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/es_MX/LC_MESSAGES/django.po | 16 +++++++++++----- xadmin/locale/eu/LC_MESSAGES/django.po | 16 +++++++++++----- xadmin/locale/id_ID/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/ja/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/lt/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/nl_NL/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/pl/LC_MESSAGES/django.po | 16 +++++++++++----- xadmin/locale/pt_BR/LC_MESSAGES/django.po | 16 +++++++++++----- xadmin/locale/ru_RU/LC_MESSAGES/django.po | 14 +++++++++----- xadmin/locale/zh_CN/LC_MESSAGES/django.mo | Bin 19576 -> 19606 bytes xadmin/locale/zh_CN/LC_MESSAGES/django.po | 14 +++++++++----- .../templates/xadmin/filters/fk_search.html | 14 +++++++++++--- 15 files changed, 134 insertions(+), 64 deletions(-) diff --git a/xadmin/filters.py b/xadmin/filters.py index 178ea6581..cb90a3a7f 100644 --- a/xadmin/filters.py +++ b/xadmin/filters.py @@ -314,7 +314,7 @@ def test(cls, field, request, params, model, admin_view, field_path): return False related_modeladmin = admin_view.admin_site._registry.get( get_model_from_relation(field)) - return related_modeladmin and getattr(related_modeladmin, 'relfield_style', None) == 'fk-ajax' + return related_modeladmin and getattr(related_modeladmin, 'relfield_style', None) in ('fk-ajax', 'fk-select') def __init__(self, field, request, params, model, model_admin, field_path): other_model = get_model_from_relation(field) @@ -327,6 +327,9 @@ def __init__(self, field, request, params, model, model_admin, field_path): super(RelatedFieldSearchFilter, self).__init__( field, request, params, model, model_admin, field_path) + related_modeladmin = self.admin_view.admin_site._registry.get(other_model) + self.relfield_style = related_modeladmin.relfield_style + if hasattr(field, 'verbose_name'): self.lookup_title = field.verbose_name else: @@ -353,6 +356,7 @@ def get_context(self): context['search_url'] = self.search_url context['label'] = self.label context['choices'] = self.choices + context['relfield_style'] = self.relfield_style return context diff --git a/xadmin/locale/de_DE/LC_MESSAGES/django.po b/xadmin/locale/de_DE/LC_MESSAGES/django.po index 2f004bac5..f6a1c74df 100644 --- a/xadmin/locale/de_DE/LC_MESSAGES/django.po +++ b/xadmin/locale/de_DE/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-12-19 11:06+0000\n" "Last-Translator: Sebastian Morkisch \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/xadmin/language/de_DE/)\n" @@ -24,7 +24,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Alle" @@ -681,7 +681,7 @@ msgstr "Themeneinstellungen" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "Suchen" @@ -840,7 +840,7 @@ msgstr "Tag" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "Anwenden" @@ -861,7 +861,13 @@ msgstr "Von" msgid "To" msgstr "Bis" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +#, fuzzy +#| msgid "Select Date" +msgid "Select" +msgstr "Datum wählen" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "Entfernen" diff --git a/xadmin/locale/en/LC_MESSAGES/django.po b/xadmin/locale/en/LC_MESSAGES/django.po index 4fd99de82..1bfef79a8 100644 --- a/xadmin/locale/en/LC_MESSAGES/django.po +++ b/xadmin/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "" @@ -676,7 +676,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -835,7 +835,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -856,7 +856,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/es_MX/LC_MESSAGES/django.po b/xadmin/locale/es_MX/LC_MESSAGES/django.po index e983f586d..102c735cd 100644 --- a/xadmin/locale/es_MX/LC_MESSAGES/django.po +++ b/xadmin/locale/es_MX/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-05-12 18:45+0000\n" "Last-Translator: sacrac \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/xadmin/language/es_MX/)\n" @@ -28,7 +28,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Todo" @@ -693,7 +693,7 @@ msgstr "Temas" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "Buscar" @@ -852,7 +852,7 @@ msgstr "día" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "Aplicar" @@ -873,7 +873,13 @@ msgstr "De" msgid "To" msgstr "Para" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +#, fuzzy +#| msgid "Select Date" +msgid "Select" +msgstr "Seleccionar Fecha" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "Limpiar" diff --git a/xadmin/locale/eu/LC_MESSAGES/django.po b/xadmin/locale/eu/LC_MESSAGES/django.po index 7bfa3f193..1ff90f75a 100644 --- a/xadmin/locale/eu/LC_MESSAGES/django.po +++ b/xadmin/locale/eu/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Basque (http://www.transifex.com/projects/p/xadmin/language/eu/)\n" @@ -22,7 +22,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Guztia" @@ -679,7 +679,7 @@ msgstr "Itsura-gaiak" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "Bilatu" @@ -838,7 +838,7 @@ msgstr "eguna" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "Aplikatu" @@ -859,7 +859,13 @@ msgstr "Nork" msgid "To" msgstr "Nori" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +#, fuzzy +#| msgid "Select Date" +msgid "Select" +msgstr "Data Aukeratu" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "Garbitu" diff --git a/xadmin/locale/id_ID/LC_MESSAGES/django.po b/xadmin/locale/id_ID/LC_MESSAGES/django.po index 1550f73ba..ccd641d0f 100644 --- a/xadmin/locale/id_ID/LC_MESSAGES/django.po +++ b/xadmin/locale/id_ID/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/xadmin/language/id_ID/)\n" @@ -21,7 +21,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "" @@ -668,7 +668,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -827,7 +827,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -848,7 +848,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/ja/LC_MESSAGES/django.po b/xadmin/locale/ja/LC_MESSAGES/django.po index 60d664494..0f15144aa 100644 --- a/xadmin/locale/ja/LC_MESSAGES/django.po +++ b/xadmin/locale/ja/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/xadmin/language/ja/)\n" @@ -21,7 +21,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "" @@ -668,7 +668,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -827,7 +827,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -848,7 +848,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/lt/LC_MESSAGES/django.po b/xadmin/locale/lt/LC_MESSAGES/django.po index c2f89d55a..d60c7abac 100644 --- a/xadmin/locale/lt/LC_MESSAGES/django.po +++ b/xadmin/locale/lt/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/xadmin/language/lt/)\n" @@ -21,7 +21,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "" @@ -680,7 +680,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -839,7 +839,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -860,7 +860,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/nl_NL/LC_MESSAGES/django.po b/xadmin/locale/nl_NL/LC_MESSAGES/django.po index e6474fa2c..c2a9afeb1 100644 --- a/xadmin/locale/nl_NL/LC_MESSAGES/django.po +++ b/xadmin/locale/nl_NL/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: sshwsfc \n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/xadmin/language/nl_NL/)\n" @@ -21,7 +21,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "" @@ -674,7 +674,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -833,7 +833,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -854,7 +854,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/pl/LC_MESSAGES/django.po b/xadmin/locale/pl/LC_MESSAGES/django.po index 6ae7c890e..95ea60d46 100644 --- a/xadmin/locale/pl/LC_MESSAGES/django.po +++ b/xadmin/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django-xadmin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2014-08-12 21:08+0100\n" "Last-Translator: Michał Szpadzik \n" "Language-Team: Polish translators \n" @@ -22,7 +22,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Wszystko" @@ -682,7 +682,7 @@ msgstr "Tematy" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "Szukaj" @@ -841,7 +841,7 @@ msgstr "dzień" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "Zatwierdź" @@ -862,7 +862,13 @@ msgstr "Od" msgid "To" msgstr "Do" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +#, fuzzy +#| msgid "Select Date" +msgid "Select" +msgstr "Wybierz datę" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "Wyczyść" diff --git a/xadmin/locale/pt_BR/LC_MESSAGES/django.po b/xadmin/locale/pt_BR/LC_MESSAGES/django.po index cd2edbf0a..0e669c8e6 100644 --- a/xadmin/locale/pt_BR/LC_MESSAGES/django.po +++ b/xadmin/locale/pt_BR/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-11-20 10:21+0000\n" "Last-Translator: gladson \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xadmin/language/pt_BR/)\n" @@ -25,7 +25,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Tudo" @@ -682,7 +682,7 @@ msgstr "Temas" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "Pesquisar" @@ -841,7 +841,7 @@ msgstr "dia" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "Aplicar" @@ -862,7 +862,13 @@ msgstr "De" msgid "To" msgstr "Para" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +#, fuzzy +#| msgid "Select Date" +msgid "Select" +msgstr "Selecionar Data" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "Limpar" diff --git a/xadmin/locale/ru_RU/LC_MESSAGES/django.po b/xadmin/locale/ru_RU/LC_MESSAGES/django.po index 0999f34b4..584abcad9 100644 --- a/xadmin/locale/ru_RU/LC_MESSAGES/django.po +++ b/xadmin/locale/ru_RU/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xadmin-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-27 11:53+0800\n" +"POT-Creation-Date: 2016-03-03 19:50+0800\n" "PO-Revision-Date: 2013-12-28 19:36+0000\n" "Last-Translator: crazyzubr \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/xadmin/language/ru_RU/)\n" @@ -22,7 +22,7 @@ msgstr "" msgid "Administration" msgstr "" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "Все" @@ -682,7 +682,7 @@ msgstr "" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "" @@ -841,7 +841,7 @@ msgstr "" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "" @@ -862,7 +862,11 @@ msgstr "" msgid "To" msgstr "" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "" diff --git a/xadmin/locale/zh_CN/LC_MESSAGES/django.mo b/xadmin/locale/zh_CN/LC_MESSAGES/django.mo index 648e21f4d6def80b77d05310f05745a90d0403bd..d8978bc3b60c5a26e55bed8349e7bda6f0beff53 100644 GIT binary patch delta 5291 zcmXxo33L_J9mnzevXH#2WQB+!VP6sqt0bflB%u-(WnbDtSsKEs7D!oaeITo4DLN-2 zawr_&918^`#)@qL4;BPV*aXB%h*Xe81jLpAVxiw(-rqU=`P~1VnY+!MdFZ`2e6O$d z1!@w*${k0l&$-93D$=X=4nrSB_6@4)Z2cZV?3(Up27>DnmZrqRjaR>QJ1FFGryn-*`4P1oN z(wvLM+o%CPLf!9Y6zwn;g%9qscFtw@?#$ zV0lO*R+l^u)ou%n#~exju7E-!K8viH8*lkM>`lHBb;BvtfG(n*&Rwhbvs_y0G*rh; zPy=dhd1vfTo{yTyGOPD6prw10f;!lUn%ORMpVe1k2kNVlKQ1oaxn`J!y8l_!vmb^U z$ar&#ou7efcMfV`OE3gqOK1JHB;{1-8E-(1a3`w%uc!w9fm)d(s2N_g{A+AQ9@3cE zV_TeoMff)E#)(*(;oN3Ch8oC>Oy|OIekSX$-MyHKWL$@JD}dS)`%o)$2zA3*)Bvlo zZquQzyMbDPTI`9TP1xyJglcyJ>JiUD_NQBpdX!rN6f~pvu|9raCr+SdbP3hbL)1!y zHD#GG2Akt}d=8hQ23U(4&;!&`hw+?rUwzd1hNyw2V>b-6rJxy>paxKeTKXk80#~C3 zc-6dxbu&dZ9Lgy4=%O(MAG16iL&>wv_NWPUM&17mhUxwPIR$k%7S+HM)CJQ~4a~zZ ze97t;TD}_9aXD(nTTn~B!|JP09iBs86n6);A_*;m6Hdoyz5nef=$YrCI(`~^;!vE9 zcUH?CA^PXx}-M2nPebup3BBa?2GDf2>S77mjBA~si^zQkUwq#f9a9@xee>D zr8z`}UXRnL8C*ft-@|YWZyW3=8a1F~^y3rwHs;#-t5$y-HJ}Hml?}<_Ylu-uldcnL zZ;jUatAlY=sKZk1fwPd$x2wcKcnq}%GPCIve~s;Nqj?hbjSp$ZHJFBF*bOz1U8n)< z#wBckn;z%HQPip!Q?L(S+GYU%Hy9-YexP9Pj(NfR*|Gp#-w zb$uSHpI&C5KLs^79J}Hed>LOy-H^sKbwg8(!)#Os`51%6sE&rC209+Kv?ZwPCL@dI zW~27ZX4G%Uew?cJzlK6S6@B@I>5fZKOLYJ>fE%a=Yf(%2J!)lq9fJdkzfjYrLmsl<+?#g(kky|> z_LZx#Jcj34pF9b*r<$YM$uaXVpo&7P7+{V-bupH~7J7gPK@=uD$>LsL&=HiRySP>V{IwXJIe$7p;CDYT!rg{28mSMm2m5 zHNg8;ACt#BPo9SQ@C+~~=du3ka4{9?a0RO2wW#{d<~CHr6{y|5AGIluqOLz_=g*mlAp$6DCK%o_d?wE!pI1yF92ruIhoXRWmJbr-MtT{gkHk6CH zuK+c(QK*i~?EFI19{9cG>reyUWO-ma1vOZS8u=b9#E(%UjOCq_nWz=$gqleqs-sb; z8I_{0dk)pk0&|s}Ux#%a<7m!r$L4zfqxjzbj*1-AlI}oVSYiGh)xklt3bmV0VHd1H zb(mZb9AFbv-U0hy57hlj%~f{3ye<#06jrenHGua}1Na;2#slUN)DnM!>fk2ox(8-> z&*1&>sPjpv`!iAPwnEisq3UxnF+icfDh8{9d=%=!X_n75SD~ON{o9d_&RPwy$zqC{{87l|th&xaX zTtGGa2$M0scksIAr~!7sP|Uab0@T3z+xe0Jg%_!K9yNgL=6B|OQ~$EmcOt^fL0vz> z9D^EQ3F=YKKn-v!vOnEnGxBME%E|kffvHwlg_=PH>QQ`zWAR^D54*90w5guLwKy78 ze-{VgL(2yi+rZ2*s1+!&e6slh`t|9?-eID^Bwl4CuaCgc`FkO68=lA z4t}rQ*F>y$J~7L8&hsZV8h4TW43R`DWAQFgNa&bIgi^l(_YfBd9m|OC>q>kkkrk{v zqPcc2B|nisSs$G%-r}Sz-({~NDZ}@jcQUD~FT(RDXQf@`oW53r2_63<^cZe?1CldZ z=zm*fk@X>Td`5g+S7M~*S?|^4uHpY7``kO4+#oiLdw51}7IELZo!lt=7^P${AtkBB zX-W%;Rm3aAGsI5f3*z5|pL;{R;*_qwue=2*&0=p*H-eZzob)PEk^BJ?1 zuY>c5QsNMCl+eM;?dB12wE9QnJL=vgLWnzrj>SRTG|6>4U;}Z4xJP_Tv?n$a9A05+ zLh-d=*?nogg%632L<(&j!~?`}B8ohoSWmfR%Nb YcI`W5cF612rG4ehjxmXw=M+W$AGaqzlmGw# delta 5276 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\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xadmin/language/zh_CN/)\n" @@ -23,7 +23,7 @@ msgstr "" msgid "Administration" msgstr "管理" -#: filters.py:158 filters.py:190 filters.py:402 filters.py:488 filters.py:526 +#: filters.py:158 filters.py:190 filters.py:406 filters.py:492 filters.py:530 msgid "All" msgstr "全部" @@ -670,7 +670,7 @@ msgstr "主题" #: templates/xadmin/blocks/model_list.nav_form.search_form.html:8 #: templates/xadmin/filters/char.html:7 #: templates/xadmin/filters/fk_search.html:7 -#: templates/xadmin/filters/fk_search.html:14 +#: templates/xadmin/filters/fk_search.html:17 #: templates/xadmin/filters/number.html:7 msgid "Search" msgstr "搜索" @@ -829,7 +829,7 @@ msgstr "日" #: templates/xadmin/filters/date.html:29 templates/xadmin/filters/date.html:46 #: templates/xadmin/filters/date.html:54 -#: templates/xadmin/filters/fk_search.html:16 +#: templates/xadmin/filters/fk_search.html:21 #: templates/xadmin/filters/number.html:37 msgid "Apply" msgstr "应用" @@ -850,7 +850,11 @@ msgstr "从" msgid "To" msgstr "到" -#: templates/xadmin/filters/fk_search.html:18 +#: templates/xadmin/filters/fk_search.html:15 +msgid "Select" +msgstr "选择" + +#: templates/xadmin/filters/fk_search.html:23 #: templates/xadmin/filters/number.html:39 msgid "Clean" msgstr "清除" diff --git a/xadmin/templates/xadmin/filters/fk_search.html b/xadmin/templates/xadmin/filters/fk_search.html index 7876980bd..6255e9eb9 100644 --- a/xadmin/templates/xadmin/filters/fk_search.html +++ b/xadmin/templates/xadmin/filters/fk_search.html @@ -9,9 +9,17 @@

    {{ form_params|safe }} - + {% if spec.used_params %} From 0321f348ef237b402915f31695c51cf57e7364af Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Tue, 15 Mar 2016 20:49:54 -0300 Subject: [PATCH 045/180] Removing 'create_time' field because it does not support editing. --- demo_app/app/adminx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py index 716188884..cbae486e9 100644 --- a/demo_app/app/adminx.py +++ b/demo_app/app/adminx.py @@ -56,7 +56,7 @@ class IDCAdmin(object): reversion_enable = True actions = [BatchChangeAction, ] - batch_fields = ('contact', 'create_time') + batch_fields = ('contact', ) class HostAdmin(object): From fe2b067f745722e1fe84c231e9e5c15ddb645a68 Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Tue, 15 Mar 2016 21:23:27 -0300 Subject: [PATCH 046/180] Batch editing with support ManyToManyField fields. --- xadmin/plugins/batch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xadmin/plugins/batch.py b/xadmin/plugins/batch.py index 24eadeeda..a81887ae2 100644 --- a/xadmin/plugins/batch.py +++ b/xadmin/plugins/batch.py @@ -74,7 +74,8 @@ def change_models(self, queryset, cleaned_data): n = queryset.count() data = {} - for f in self.opts.fields: + fields = self.opts.fields + self.opts.many_to_many + for f in fields: if not f.editable or isinstance(f, models.AutoField) \ or not f.name in cleaned_data: continue From d189735971203647828299270def740a6db76746 Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Tue, 15 Mar 2016 21:25:00 -0300 Subject: [PATCH 047/180] Testing batch with ManyToManyField --- demo_app/app/adminx.py | 2 +- demo_app/app/models.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py index cbae486e9..ca94e6da2 100644 --- a/demo_app/app/adminx.py +++ b/demo_app/app/adminx.py @@ -56,7 +56,7 @@ class IDCAdmin(object): reversion_enable = True actions = [BatchChangeAction, ] - batch_fields = ('contact', ) + batch_fields = ('contact', 'groups') class HostAdmin(object): diff --git a/demo_app/app/models.py b/demo_app/app/models.py index e0c740e7b..a35f992cd 100644 --- a/demo_app/app/models.py +++ b/demo_app/app/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.contrib.auth.models import Group SERVER_STATUS = ( @@ -28,6 +29,7 @@ class IDC(models.Model): telphone = models.CharField(max_length=32) address = models.CharField(max_length=128) customer_id = models.CharField(max_length=128) + groups = models.ManyToManyField(Group) # many create_time = models.DateField(auto_now=True) From 0cfb8f4a854bce9195206aec7a966f9efd3d3e01 Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Tue, 15 Mar 2016 21:34:53 -0300 Subject: [PATCH 048/180] Fix "RemovedInDjango18Warning: `is_hidden` property is now read-only". --- xadmin/plugins/batch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xadmin/plugins/batch.py b/xadmin/plugins/batch.py index a81887ae2..79ecba9af 100644 --- a/xadmin/plugins/batch.py +++ b/xadmin/plugins/batch.py @@ -16,10 +16,10 @@ BATCH_CHECKBOX_NAME = '_batch_change_fields' + class ChangeFieldWidgetWrapper(forms.Widget): def __init__(self, widget): - self.is_hidden = widget.is_hidden self.needs_multipart_form = widget.needs_multipart_form self.attrs = widget.attrs self.widget = widget From 02d432505025433c43c952963a648eaba12b261f Mon Sep 17 00:00:00 2001 From: Alex Sandro Date: Tue, 15 Mar 2016 21:48:47 -0300 Subject: [PATCH 049/180] add dep required (httplib2). --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d6c24a534..d9d574c49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ django~=1.7.0 django-crispy-forms~=1.4.0 django-reversion~=1.8.0 +httplib2~=0.9.2 \ No newline at end of file From 3f128ca0328d9d91c12602d2a6e4e8ec27b8a51c Mon Sep 17 00:00:00 2001 From: gkiwi Date: Mon, 21 Mar 2016 02:50:02 +0800 Subject: [PATCH 050/180] finish base support for django1.9;demo_app can run successs;#TODO fix tests --- demo_app/app/adminx.py | 16 +-- demo_app/app/migrations/0001_initial.py | 112 ++++++++++++++++++ demo_app/app/migrations/__init__.py | 0 demo_app/app/models.py | 4 +- demo_app/demo/settings.py | 32 ++--- demo_app/demo/urls.py | 4 +- requirements.txt | 8 +- tests/runtests.py | 14 ++- tests/xtests/site/apps.py | 11 ++ tests/xtests/view_base/apps.py | 11 ++ xadmin/__init__.py | 7 +- xadmin/adminx.py | 3 +- xadmin/apps.py | 2 + xadmin/filters.py | 17 +-- xadmin/migrations/0001_initial.py | 63 ++++++++++ xadmin/migrations/__init__.py | 0 xadmin/models.py | 5 +- xadmin/plugins/__init__.py | 2 +- xadmin/plugins/actions.py | 10 +- xadmin/plugins/ajax.py | 10 +- xadmin/plugins/bookmark.py | 2 +- xadmin/plugins/chart.py | 2 +- xadmin/plugins/comments.py | 2 +- xadmin/plugins/export.py | 2 +- xadmin/plugins/filters.py | 10 +- xadmin/plugins/inline.py | 7 +- xadmin/plugins/layout.py | 2 +- xadmin/plugins/multiselect.py | 4 +- xadmin/plugins/quickfilter.py | 7 +- xadmin/plugins/refresh.py | 2 +- xadmin/plugins/relate.py | 11 +- xadmin/plugins/sortable.py | 2 +- xadmin/plugins/topnav.py | 3 +- xadmin/plugins/wizard.py | 10 +- xadmin/plugins/xversion.py | 15 +-- xadmin/sites.py | 33 +++--- xadmin/templates/xadmin/500.html | 2 +- .../xadmin/auth/password_reset/complete.html | 2 +- .../xadmin/auth/password_reset/confirm.html | 2 +- .../xadmin/auth/password_reset/done.html | 2 +- .../xadmin/auth/password_reset/email.html | 2 +- .../xadmin/auth/password_reset/form.html | 2 +- .../xadmin/auth/user/change_password.html | 2 +- xadmin/templates/xadmin/base.html | 2 +- xadmin/templates/xadmin/base_site.html | 3 - .../xadmin/blocks/comm.top.setlang.html | 2 +- .../xadmin/blocks/comm.top.topnav.html | 4 +- .../xadmin/includes/sitemenu_accordion.html | 2 +- .../xadmin/includes/sitemenu_default.html | 2 +- xadmin/templates/xadmin/views/app_index.html | 2 +- .../xadmin/views/batch_change_form.html | 2 +- xadmin/templates/xadmin/views/dashboard.html | 2 +- xadmin/templates/xadmin/views/form.html | 2 +- .../templates/xadmin/views/invalid_setup.html | 2 +- xadmin/templates/xadmin/views/logged_out.html | 2 +- xadmin/templates/xadmin/views/login.html | 2 +- .../xadmin/views/model_dashboard.html | 2 +- .../xadmin/views/model_delete_confirm.html | 2 +- .../views/model_delete_selected_confirm.html | 2 +- .../templates/xadmin/views/model_detail.html | 2 +- xadmin/templates/xadmin/views/model_form.html | 2 +- .../templates/xadmin/views/model_history.html | 2 +- xadmin/templates/xadmin/views/model_list.html | 2 +- .../templates/xadmin/views/recover_form.html | 2 +- .../templates/xadmin/views/recover_list.html | 2 +- .../templates/xadmin/views/revision_diff.html | 2 +- .../templates/xadmin/views/revision_form.html | 2 +- xadmin/templatetags/xadmin_tags.py | 6 +- xadmin/util.py | 34 +++--- xadmin/views/base.py | 21 ++-- xadmin/views/dashboard.py | 7 +- xadmin/views/edit.py | 20 ++-- xadmin/views/form.py | 4 +- xadmin/views/list.py | 12 +- 74 files changed, 414 insertions(+), 200 deletions(-) create mode 100644 demo_app/app/migrations/0001_initial.py create mode 100644 demo_app/app/migrations/__init__.py create mode 100644 tests/xtests/site/apps.py create mode 100644 tests/xtests/view_base/apps.py create mode 100644 xadmin/migrations/0001_initial.py create mode 100644 xadmin/migrations/__init__.py diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py index 716188884..52cb03b04 100644 --- a/demo_app/app/adminx.py +++ b/demo_app/app/adminx.py @@ -18,13 +18,13 @@ class MainDashboard(object): {"type": "addform", "model": MaintainLog}, ] ] -xadmin.site.register(views.website.IndexView, MainDashboard) +xadmin.sites.site.register(views.website.IndexView, MainDashboard) class BaseSetting(object): enable_themes = True use_bootswatch = True -xadmin.site.register(views.BaseAdminView, BaseSetting) +xadmin.sites.site.register(views.BaseAdminView, BaseSetting) class GlobalSetting(object): @@ -33,7 +33,7 @@ class GlobalSetting(object): Host: 'fa fa-laptop', IDC: 'fa fa-cloud' } menu_style = 'default'#'accordion' -xadmin.site.register(views.CommAdminView, GlobalSetting) +xadmin.sites.site.register(views.CommAdminView, GlobalSetting) class MaintainInline(object): @@ -195,8 +195,8 @@ def _chart_month(self,obj): return obj.date.strftime("%B") -xadmin.site.register(Host, HostAdmin) -xadmin.site.register(HostGroup, HostGroupAdmin) -xadmin.site.register(MaintainLog, MaintainLogAdmin) -xadmin.site.register(IDC, IDCAdmin) -xadmin.site.register(AccessRecord, AccessRecordAdmin) +xadmin.sites.site.register(Host, HostAdmin) +xadmin.sites.site.register(HostGroup, HostGroupAdmin) +xadmin.sites.site.register(MaintainLog, MaintainLogAdmin) +xadmin.sites.site.register(IDC, IDCAdmin) +xadmin.sites.site.register(AccessRecord, AccessRecordAdmin) diff --git a/demo_app/app/migrations/0001_initial.py b/demo_app/app/migrations/0001_initial.py new file mode 100644 index 000000000..39154fd5b --- /dev/null +++ b/demo_app/app/migrations/0001_initial.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-03-20 15:50 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='AccessRecord', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateField()), + ('user_count', models.IntegerField()), + ('view_count', models.IntegerField()), + ], + options={ + 'verbose_name': 'Access Record', + 'verbose_name_plural': 'Access Record', + }, + ), + migrations.CreateModel( + name='Host', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64)), + ('nagios_name', models.CharField(blank=True, max_length=64, null=True, verbose_name='Nagios Host ID')), + ('ip', models.GenericIPAddressField(blank=True, null=True)), + ('internal_ip', models.GenericIPAddressField(blank=True, null=True)), + ('user', models.CharField(max_length=64)), + ('password', models.CharField(max_length=128)), + ('ssh_port', models.IntegerField(blank=True, null=True)), + ('status', models.SmallIntegerField(choices=[(0, 'Normal'), (1, 'Down'), (2, 'No Connect'), (3, 'Error')])), + ('brand', models.CharField(choices=[('DELL', 'DELL'), ('HP', 'HP'), ('Other', 'Other')], max_length=64)), + ('model', models.CharField(max_length=64)), + ('cpu', models.CharField(max_length=64)), + ('core_num', models.SmallIntegerField(choices=[(2, b'2 Cores'), (4, b'4 Cores'), (6, b'6 Cores'), (8, b'8 Cores'), (10, b'10 Cores'), (12, b'12 Cores'), (14, b'14 Cores'), (16, b'16 Cores'), (18, b'18 Cores'), (20, b'20 Cores'), (22, b'22 Cores'), (24, b'24 Cores'), (26, b'26 Cores'), (28, b'28 Cores')])), + ('hard_disk', models.IntegerField()), + ('memory', models.IntegerField()), + ('system', models.CharField(choices=[('CentOS', 'CentOS'), ('FreeBSD', 'FreeBSD'), ('Ubuntu', 'Ubuntu')], max_length=32, verbose_name='System OS')), + ('system_version', models.CharField(max_length=32)), + ('system_arch', models.CharField(choices=[('x86_64', 'x86_64'), ('i386', 'i386')], max_length=32)), + ('create_time', models.DateField()), + ('guarantee_date', models.DateField()), + ('service_type', models.CharField(choices=[(b'moniter', 'Moniter'), (b'lvs', 'LVS'), (b'db', 'Database'), (b'analysis', 'Analysis'), (b'admin', 'Admin'), (b'storge', 'Storge'), (b'web', 'WEB'), (b'email', 'Email'), (b'mix', 'Mix')], max_length=32)), + ('description', models.TextField()), + ], + options={ + 'verbose_name': 'Host', + 'verbose_name_plural': 'Host', + }, + ), + migrations.CreateModel( + name='HostGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=32)), + ('description', models.TextField()), + ('hosts', models.ManyToManyField(blank=True, related_name='groups', to='app.Host', verbose_name='Hosts')), + ], + options={ + 'verbose_name': 'Host Group', + 'verbose_name_plural': 'Host Group', + }, + ), + migrations.CreateModel( + name='IDC', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64)), + ('description', models.TextField()), + ('contact', models.CharField(max_length=32)), + ('telphone', models.CharField(max_length=32)), + ('address', models.CharField(max_length=128)), + ('customer_id', models.CharField(max_length=128)), + ('create_time', models.DateField(auto_now=True)), + ], + options={ + 'verbose_name': 'IDC', + 'verbose_name_plural': 'IDC', + }, + ), + migrations.CreateModel( + name='MaintainLog', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('maintain_type', models.CharField(max_length=32)), + ('hard_type', models.CharField(max_length=16)), + ('time', models.DateTimeField()), + ('operator', models.CharField(max_length=16)), + ('note', models.TextField()), + ('host', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.Host')), + ], + options={ + 'verbose_name': 'Maintain Log', + 'verbose_name_plural': 'Maintain Log', + }, + ), + migrations.AddField( + model_name='host', + name='idc', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.IDC'), + ), + ] diff --git a/demo_app/app/migrations/__init__.py b/demo_app/app/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/demo_app/app/models.py b/demo_app/app/models.py index e0c740e7b..e5f026ca9 100644 --- a/demo_app/app/models.py +++ b/demo_app/app/models.py @@ -43,8 +43,8 @@ class Host(models.Model): idc = models.ForeignKey(IDC) name = models.CharField(max_length=64) nagios_name = models.CharField(u"Nagios Host ID", max_length=64, blank=True, null=True) - ip = models.IPAddressField(blank=True, null=True) - internal_ip = models.IPAddressField(blank=True, null=True) + ip = models.GenericIPAddressField(blank=True, null=True) + internal_ip = models.GenericIPAddressField(blank=True, null=True) user = models.CharField(max_length=64) password = models.CharField(max_length=128) ssh_port = models.IntegerField(blank=True, null=True) diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py index 431019ebc..8a8762beb 100644 --- a/demo_app/demo/settings.py +++ b/demo_app/demo/settings.py @@ -11,7 +11,6 @@ os.path.realpath(os.path.dirname(__file__)), os.pardir) DEBUG = True -TEMPLATE_DEBUG = DEBUG ADMINS = ( # ('Your Name', 'your_email@example.com'), @@ -98,13 +97,6 @@ # Make this unique, and don't share it with anybody. SECRET_KEY = '5=!nss_+^nvyyc_j(tdcf!7(_una*3gtw+_8v5jaa=)j0g^d_2' -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - # 'django.template.loaders.eggs.Loader', -) - MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -121,12 +113,24 @@ # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'demo.wsgi.application' -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - os.path.join(PROJECT_ROOT, "templates"), -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(PROJECT_ROOT,"templates"), + ], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + 'debug':DEBUG + }, + }, +] INSTALLED_APPS = ( 'django.contrib.auth', diff --git a/demo_app/demo/urls.py b/demo_app/demo/urls.py index 7c425d02c..7df140002 100644 --- a/demo_app/demo/urls.py +++ b/demo_app/demo/urls.py @@ -8,7 +8,7 @@ from django.contrib import admin -urlpatterns = patterns('', +urlpatterns = [ url(https://github.com/r'%5Eadmin/',%20include(admin.site.urls)), url(https://github.com/r'%5E',%20include(xadmin.site.urls)) -) +] diff --git a/requirements.txt b/requirements.txt index d6c24a534..933ee0907 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ -django~=1.7.0 -django-crispy-forms~=1.4.0 -django-reversion~=1.8.0 +django>=1.9.0 +django-crispy-forms +django-reversion +django-formtools==1.0 +httplib2==0.9.2 diff --git a/tests/runtests.py b/tests/runtests.py index 0f7884b47..60ca063ab 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -5,6 +5,7 @@ import tempfile import django +from django.apps import AppConfig,apps TEST_ROOT = os.path.realpath(os.path.dirname(__file__)) @@ -77,8 +78,7 @@ def setup(verbosity, test_labels): # access settings because of the USE_I18N dependency.) django.setup() - from django.db.models.loading import get_apps, load_app - get_apps() + [a.models_module for a in apps.get_app_configs()] # Load all the test model apps. test_labels_set = set([label.split('.')[0] for label in test_labels]) @@ -92,7 +92,15 @@ def setup(verbosity, test_labels): if not test_labels or module_name in test_labels_set: if verbosity >= 2: print "Importing application %s" % module_name - mod = load_app(module_label) + #mod = load_app(module_label) + #TODO by gkiwi @2016-03-21 02:48:12 + + app_config = AppConfig.create(module_label) + app_config.import_models(apps.all_models[app_config.label]) + apps.app_configs[app_config.label] = app_config + apps.clear_cache() + mod = app_config.models_module + if mod: if module_label not in settings.INSTALLED_APPS: settings.INSTALLED_APPS.append(module_label) diff --git a/tests/xtests/site/apps.py b/tests/xtests/site/apps.py new file mode 100644 index 000000000..1ab4a5c31 --- /dev/null +++ b/tests/xtests/site/apps.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +#coding:utf-8 +import sys +if sys.getdefaultencoding()=='ascii': + reload(sys) + sys.setdefaultencoding('utf-8') + +from django.apps import AppConfig + +class SiteApp(AppConfig): + name = "site" diff --git a/tests/xtests/view_base/apps.py b/tests/xtests/view_base/apps.py new file mode 100644 index 000000000..6398388ca --- /dev/null +++ b/tests/xtests/view_base/apps.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +#coding:utf-8 +import sys +if sys.getdefaultencoding()=='ascii': + reload(sys) + sys.setdefaultencoding('utf-8') + +from django.apps import AppConfig + +class ViewBaseApp(AppConfig): + name = "view_base" diff --git a/xadmin/__init__.py b/xadmin/__init__.py index 7aa7c8e46..6a4f3b093 100644 --- a/xadmin/__init__.py +++ b/xadmin/__init__.py @@ -1,4 +1,3 @@ -from xadmin.sites import AdminSite, site VERSION = [0,5,0] @@ -14,10 +13,10 @@ def autodiscover(): may want. """ + from importlib import import_module from django.conf import settings - from django.utils.importlib import import_module from django.utils.module_loading import module_has_submodule - + from xadmin.sites import AdminSite, site setattr(settings, 'CRISPY_TEMPLATE_PACK', 'bootstrap3') setattr(settings, 'CRISPY_CLASS_CONVERTERS', { "textinput": "textinput textInput form-control", @@ -66,4 +65,4 @@ def autodiscover(): if module_has_submodule(mod, 'adminx'): raise -default_app_config = 'xadmin.apps.XAdminConfig' \ No newline at end of file +default_app_config = 'xadmin.apps.XAdminConfig' diff --git a/xadmin/adminx.py b/xadmin/adminx.py index 1fece0dcb..537d634d7 100644 --- a/xadmin/adminx.py +++ b/xadmin/adminx.py @@ -6,4 +6,5 @@ class UserSettingsAdmin(object): model_icon = 'fa fa-cog' hidden_menu = True -xadmin.site.register(UserSettings, UserSettingsAdmin) + +xadmin.sites.site.register(UserSettings, UserSettingsAdmin) diff --git a/xadmin/apps.py b/xadmin/apps.py index 252a6cbed..118dac7e4 100644 --- a/xadmin/apps.py +++ b/xadmin/apps.py @@ -1,6 +1,7 @@ from django.apps import AppConfig from django.core import checks from django.utils.translation import ugettext_lazy as _ +import xadmin class XAdminConfig(AppConfig): @@ -11,3 +12,4 @@ class XAdminConfig(AppConfig): def ready(self): self.module.autodiscover() + setattr(xadmin,'site',xadmin.sites.site) diff --git a/xadmin/filters.py b/xadmin/filters.py index cb90a3a7f..6f44bff63 100644 --- a/xadmin/filters.py +++ b/xadmin/filters.py @@ -8,9 +8,10 @@ from django.utils.safestring import mark_safe from django.utils.html import escape,format_html from django.utils.text import Truncator -from django.core.cache import cache, get_cache +from django.core.cache import cache, caches from xadmin.views.list import EMPTY_CHANGELIST_VALUE +from xadmin.util import is_related_field,is_related_field2 import datetime FILTER_PREFIX = '_p_' @@ -310,7 +311,7 @@ class RelatedFieldSearchFilter(FieldFilter): @classmethod def test(cls, field, request, params, model, admin_view, field_path): - if not (hasattr(field, 'rel') and bool(field.rel) or isinstance(field, models.related.RelatedObject)): + if not is_related_field2(field): return False related_modeladmin = admin_view.admin_site._registry.get( get_model_from_relation(field)) @@ -365,7 +366,7 @@ class RelatedFieldListFilter(ListFieldFilter): @classmethod def test(cls, field, request, params, model, admin_view, field_path): - return (hasattr(field, 'rel') and bool(field.rel) or isinstance(field, models.related.RelatedObject)) + return is_related_field2(field) def __init__(self, field, request, params, model, model_admin, field_path): other_model = get_model_from_relation(field) @@ -387,7 +388,7 @@ def __init__(self, field, request, params, model, model_admin, field_path): self.title = self.lookup_title def has_output(self): - if (isinstance(self.field, models.related.RelatedObject) + if (is_related_field(self.field) and self.field.field.null or hasattr(self.field, 'rel') and self.field.null): extra = 1 @@ -413,7 +414,7 @@ def choices(self): }, [self.lookup_isnull_name]), 'display': val, } - if (isinstance(self.field, models.related.RelatedObject) + if (is_related_field(self.field) and self.field.field.null or hasattr(self.field, 'rel') and self.field.null): yield { @@ -443,13 +444,13 @@ def test(cls, field, request, params, model, admin_view, field_path): def get_cached_choices(self): if not self.cache_config['enabled']: return None - c = get_cache(self.cache_config['cache']) + c = caches(self.cache_config['cache']) return c.get(self.cache_config['key']%self.field_path) def set_cached_choices(self,choices): if not self.cache_config['enabled']: return - c = get_cache(self.cache_config['cache']) + c = caches(self.cache_config['cache']) return c.set(self.cache_config['key']%self.field_path,choices) def __init__(self, field, request, params, model, model_admin, field_path,field_order_by=None,field_limit=None,sort_key=None,cache_config=None): @@ -547,4 +548,4 @@ def choices(self): 'query_string': self.query_string({self.lookup_isnull_name: 'True'}, [self.lookup_exact_name]), 'display': EMPTY_CHANGELIST_VALUE, - } \ No newline at end of file + } diff --git a/xadmin/migrations/0001_initial.py b/xadmin/migrations/0001_initial.py new file mode 100644 index 000000000..6d21b1571 --- /dev/null +++ b/xadmin/migrations/0001_initial.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-20 13:46 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Bookmark', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=128, verbose_name='Title')), + ('url_name', models.CharField(max_length=64, verbose_name='Url Name')), + ('query', models.CharField(blank=True, max_length=1000, verbose_name='Query String')), + ('is_share', models.BooleanField(default=False, verbose_name='Is Shared')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'Bookmark', + 'verbose_name_plural': 'Bookmarks', + }, + ), + migrations.CreateModel( + name='UserSettings', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(max_length=256, verbose_name='Settings Key')), + ('value', models.TextField(verbose_name='Settings Content')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'User Setting', + 'verbose_name_plural': 'User Settings', + }, + ), + migrations.CreateModel( + name='UserWidget', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('page_id', models.CharField(max_length=256, verbose_name='Page')), + ('widget_type', models.CharField(max_length=50, verbose_name='Widget Type')), + ('value', models.TextField(verbose_name='Widget Params')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'User Widget', + 'verbose_name_plural': 'User Widgets', + }, + ), + ] diff --git a/xadmin/migrations/__init__.py b/xadmin/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/xadmin/models.py b/xadmin/models.py index 6f33a7606..32082e472 100644 --- a/xadmin/models.py +++ b/xadmin/models.py @@ -9,7 +9,7 @@ from django.db.models.base import ModelBase from django.utils.encoding import smart_unicode -from django.db.models.signals import post_syncdb +from django.db.models.signals import post_migrate from django.contrib.auth.models import Permission import datetime @@ -40,8 +40,7 @@ def add_view_permissions(sender, **kwargs): #print "Added view permission for %s" % content_type.name # check for all our view permissions after a syncdb -post_syncdb.connect(add_view_permissions) - +post_migrate.connect(add_view_permissions) class Bookmark(models.Model): title = models.CharField(_(u'Title'), max_length=128) diff --git a/xadmin/plugins/__init__.py b/xadmin/plugins/__init__.py index 395a0f4c2..7fbc5644f 100644 --- a/xadmin/plugins/__init__.py +++ b/xadmin/plugins/__init__.py @@ -6,7 +6,7 @@ def register_builtin_plugins(site): - from django.utils.importlib import import_module + from importlib import import_module from django.conf import settings exclude_plugins = getattr(settings, 'XADMIN_EXCLUDE_PLUGINS', []) diff --git a/xadmin/plugins/actions.py b/xadmin/plugins/actions.py index 894ea0641..ff08054d1 100644 --- a/xadmin/plugins/actions.py +++ b/xadmin/plugins/actions.py @@ -1,10 +1,10 @@ +from collections import OrderedDict from django import forms from django.core.exceptions import PermissionDenied from django.db import router from django.http import HttpResponse, HttpResponseRedirect from django.template import loader from django.template.response import TemplateResponse -from django.utils.datastructures import SortedDict from django.utils.encoding import force_unicode from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _, ungettext @@ -209,7 +209,7 @@ def response_action(self, ac, queryset): def get_actions(self): if self.actions is None: - return SortedDict() + return OrderedDict() actions = [self.get_action(action) for action in self.global_actions] @@ -223,8 +223,8 @@ def get_actions(self): # get_action might have returned None, so filter any of those out. actions = filter(None, actions) - # Convert the actions into a SortedDict keyed by name. - actions = SortedDict([ + # Convert the actions into a OrderedDict keyed by name. + actions = OrderedDict([ (name, (ac, name, desc, icon)) for ac, name, desc, icon in actions ]) @@ -285,7 +285,7 @@ def get_media(self, media): # Block Views def block_results_bottom(self, context, nodes): if self.actions and self.admin_view.result_count: - nodes.append(loader.render_to_string('xadmin/blocks/model_list.results_bottom.actions.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.results_bottom.actions.html', request=context.request)) site.register_plugin(ActionPlugin, ListAdminView) diff --git a/xadmin/plugins/ajax.py b/xadmin/plugins/ajax.py index aa5bb32eb..f6e21c3d6 100644 --- a/xadmin/plugins/ajax.py +++ b/xadmin/plugins/ajax.py @@ -1,5 +1,5 @@ -from django import forms -from django.utils.datastructures import SortedDict +from collections import OrderedDict +from django.forms.utils import ErrorDict from django.utils.html import escape from django.utils.encoding import force_unicode from xadmin.sites import site @@ -12,7 +12,7 @@ class BaseAjaxPlugin(BaseAdminPlugin): def init_request(self, *args, **kwargs): - return bool(self.request.is_ajax() or self.request.REQUEST.get('_ajax')) + return bool(self.request.is_ajax() or self.request.GET.get('_ajax')) class AjaxListPlugin(BaseAjaxPlugin): @@ -37,7 +37,7 @@ def get_result_list(self, response): return self.render_response({'headers': headers, 'objects': objects, 'total_count': av.result_count, 'has_more': av.has_more}) -class JsonErrorDict(forms.util.ErrorDict): +class JsonErrorDict(ErrorDict): def __init__(self, errors, form): super(JsonErrorDict, self).__init__(errors) @@ -92,7 +92,7 @@ def get_response(self, __): result = self.admin_view.get_field_result(f) results.append((result.label, result.val)) - return self.render_response(SortedDict(results)) + return self.render_response(OrderedDict(results)) site.register_plugin(AjaxListPlugin, ListAdminView) site.register_plugin(AjaxFormPlugin, ModelFormAdminView) diff --git a/xadmin/plugins/bookmark.py b/xadmin/plugins/bookmark.py index a30276b16..8b6f693e3 100644 --- a/xadmin/plugins/bookmark.py +++ b/xadmin/plugins/bookmark.py @@ -119,7 +119,7 @@ def get_media(self, media): # Block Views def block_nav_menu(self, context, nodes): if self.show_bookmarks: - nodes.insert(0, loader.render_to_string('xadmin/blocks/model_list.nav_menu.bookmarks.html', context_instance=context)) + nodes.insert(0, loader.render_to_string('xadmin/blocks/model_list.nav_menu.bookmarks.html', request=context.request)) class BookmarkView(ModelAdminView): diff --git a/xadmin/plugins/chart.py b/xadmin/plugins/chart.py index e83ab8ca9..c8f639e52 100644 --- a/xadmin/plugins/chart.py +++ b/xadmin/plugins/chart.py @@ -98,7 +98,7 @@ def block_results_top(self, context, nodes): context.update({ 'charts': [{"name": name, "title": v['title'], 'url': self.get_chart_url(https://github.com/name,%20v)} for name, v in self.data_charts.items()], }) - nodes.append(loader.render_to_string('xadmin/blocks/model_list.results_top.charts.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.results_top.charts.html', request=context.request)) class ChartsView(ListAdminView): diff --git a/xadmin/plugins/comments.py b/xadmin/plugins/comments.py index 0e90462e1..279fe4d83 100644 --- a/xadmin/plugins/comments.py +++ b/xadmin/plugins/comments.py @@ -91,4 +91,4 @@ def _bulk_flag(self, queryset, action, done_message): # Only register the default admin if the model is the built-in comment model # (this won't be true if there's a custom comment app). if 'django.contrib.comments' in settings.INSTALLED_APPS and (get_model() is Comment): - xadmin.site.register(Comment, CommentsAdmin) + xadmin.sites.site.register(Comment, CommentsAdmin) diff --git a/xadmin/plugins/export.py b/xadmin/plugins/export.py index 895a30e32..fa9b7a70f 100644 --- a/xadmin/plugins/export.py +++ b/xadmin/plugins/export.py @@ -45,7 +45,7 @@ def block_top_toolbar(self, context, nodes): 'form_params': self.admin_view.get_form_params({'_do_': 'export'}, ('export_type',)), 'export_types': [{'type': et, 'name': self.export_names[et]} for et in self.list_export], }) - nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.exports.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.exports.html', request=context.request)) class ExportPlugin(BaseAdminPlugin): diff --git a/xadmin/plugins/filters.py b/xadmin/plugins/filters.py index c13dec0a1..8a128a2bc 100644 --- a/xadmin/plugins/filters.py +++ b/xadmin/plugins/filters.py @@ -5,7 +5,6 @@ from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured, ValidationError from django.db import models from django.db.models.fields import FieldDoesNotExist -from django.db.models.related import RelatedObject from django.db.models.sql.query import LOOKUP_SEP, QUERY_TERMS from django.template import loader from django.utils.encoding import smart_str @@ -14,6 +13,7 @@ from xadmin.filters import manager as filter_manager, FILTER_PREFIX, SEARCH_VAR, DateFieldListFilter, RelatedFieldSearchFilter from xadmin.sites import site from xadmin.views import BaseAdminPlugin, ListAdminView +from xadmin.util import is_related_field class IncorrectLookupParameters(Exception): @@ -49,7 +49,7 @@ def lookup_allowed(self, lookup, value): rel_name = None for part in parts[:-1]: try: - field, _, _, _ = model._meta.get_field_by_name(part) + field = model._meta.get_field(part) except FieldDoesNotExist: # Lookups on non-existants fields are ok, since they're ignored # later. @@ -57,7 +57,7 @@ def lookup_allowed(self, lookup, value): if hasattr(field, 'rel'): model = field.rel.to rel_name = field.rel.get_related_field().name - elif isinstance(field, RelatedObject): + elif is_related_field(field): model = field.model rel_name = model._meta.pk.name else: @@ -199,7 +199,7 @@ def get_media(self, media): # Block Views def block_nav_menu(self, context, nodes): if self.has_filters: - nodes.append(loader.render_to_string('xadmin/blocks/model_list.nav_menu.filters.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.nav_menu.filters.html', request=context.request)) def block_nav_form(self, context, nodes): if self.search_fields: @@ -209,6 +209,6 @@ def block_nav_form(self, context, nodes): {'search_var': SEARCH_VAR, 'remove_search_url': self.admin_view.get_query_string(remove=[SEARCH_VAR]), 'search_form_params': self.admin_view.get_form_params(remove=[SEARCH_VAR])}, - context_instance=context)) + request=context.request)) site.register_plugin(FilterPlugin, ListAdminView) diff --git a/xadmin/plugins/inline.py b/xadmin/plugins/inline.py index ca8b61daf..6a098329a 100644 --- a/xadmin/plugins/inline.py +++ b/xadmin/plugins/inline.py @@ -3,7 +3,7 @@ from django import forms from django.forms.formsets import all_valid, DELETION_FIELD_NAME from django.forms.models import inlineformset_factory, BaseInlineFormSet, modelform_defines_fields -from django.contrib.contenttypes.generic import BaseGenericInlineFormSet, generic_inlineformset_factory +from django.contrib.contenttypes.forms import BaseGenericInlineFormSet, generic_inlineformset_factory from django.template import loader from django.template.loader import render_to_string from django.contrib.auth import get_permission_codename @@ -224,7 +224,7 @@ def instance_form(self, **kwargs): value = None label = None if readonly_field in inst._meta.get_all_field_names(): - label = inst._meta.get_field_by_name(readonly_field)[0].verbose_name + label = inst._meta.get_field(readonly_field).verbose_name value = unicode(getattr(inst, readonly_field)) elif inspect.ismethod(getattr(inst, readonly_field, None)): value = getattr(inst, readonly_field)() @@ -332,7 +332,7 @@ def __init__(self, formset, allow_blank=False, **kwargs): def render(self, form, form_style, context): return render_to_string( self.template, dict({'formset': self, 'prefix': self.formset.prefix, 'inline_style': self.inline_style}, **self.extra_attrs), - context_instance=context) + request=context.request) class Inline(Fieldset): @@ -340,6 +340,7 @@ class Inline(Fieldset): def __init__(self, rel_model): self.model = rel_model self.fields = [] + super(Inline,self).__init__(legend="") def render(self, form, form_style, context): return "" diff --git a/xadmin/plugins/layout.py b/xadmin/plugins/layout.py index 2e45d1ab3..acdec6931 100644 --- a/xadmin/plugins/layout.py +++ b/xadmin/plugins/layout.py @@ -73,7 +73,7 @@ def block_top_toolbar(self, context, nodes): 'layouts': self._active_layouts, 'current_icon': self._current_icon, }) - nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.layouts.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.layouts.html', request=context.request)) site.register_plugin(GridLayoutPlugin, ListAdminView) diff --git a/xadmin/plugins/multiselect.py b/xadmin/plugins/multiselect.py index 954f6b849..795d1c817 100644 --- a/xadmin/plugins/multiselect.py +++ b/xadmin/plugins/multiselect.py @@ -4,7 +4,7 @@ import xadmin from django import forms from django.db.models import ManyToManyField -from django.forms.util import flatatt +from django.forms.utils import flatatt from django.template import loader from django.utils.encoding import force_unicode from django.utils.html import escape, conditional_escape @@ -104,4 +104,4 @@ def get_field_style(self, attrs, db_field, style, **kwargs): return attrs -xadmin.site.register_plugin(M2MSelectPlugin, ModelFormAdminView) +xadmin.sites.site.register_plugin(M2MSelectPlugin, ModelFormAdminView) diff --git a/xadmin/plugins/quickfilter.py b/xadmin/plugins/quickfilter.py index 928d4ebf5..1b6a30a24 100644 --- a/xadmin/plugins/quickfilter.py +++ b/xadmin/plugins/quickfilter.py @@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _ from xadmin.filters import manager,MultiSelectFieldListFilter from xadmin.plugins.filters import * +from xadmin.util import is_related_field @manager.register class QuickFilterMultiSelectFieldListFilter(MultiSelectFieldListFilter): @@ -56,7 +57,7 @@ def lookup_allowed(self, lookup, value): rel_name = None for part in parts[:-1]: try: - field, _, _, _ = model._meta.get_field_by_name(part) + field = model._meta.get_field(part) except FieldDoesNotExist: # Lookups on non-existants fields are ok, since they're ignored # later. @@ -64,7 +65,7 @@ def lookup_allowed(self, lookup, value): if hasattr(field, 'rel'): model = field.rel.to rel_name = field.rel.get_related_field().name - elif isinstance(field, RelatedObject): + elif is_related_field(field): model = field.model rel_name = model._meta.pk.name else: @@ -155,4 +156,4 @@ def get_list_queryset(self, queryset): def block_left_navbar(self, context, nodes): nodes.append(loader.render_to_string('xadmin/blocks/modal_list.left_navbar.quickfilter.html',context)) -site.register_plugin(QuickFilterPlugin, ListAdminView) \ No newline at end of file +site.register_plugin(QuickFilterPlugin, ListAdminView) diff --git a/xadmin/plugins/refresh.py b/xadmin/plugins/refresh.py index 8c1a0fa91..6ed4821ac 100644 --- a/xadmin/plugins/refresh.py +++ b/xadmin/plugins/refresh.py @@ -31,7 +31,7 @@ def block_top_toolbar(self, context, nodes): 'selected': str(r) == current_refresh, } for r in self.refresh_times], }) - nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.refresh.html', context_instance=context)) + nodes.append(loader.render_to_string('xadmin/blocks/model_list.top_toolbar.refresh.html', request=context.request)) site.register_plugin(RefreshPlugin, ListAdminView) diff --git a/xadmin/plugins/relate.py b/xadmin/plugins/relate.py index 9a8aab192..6dc4d5f3d 100644 --- a/xadmin/plugins/relate.py +++ b/xadmin/plugins/relate.py @@ -4,12 +4,13 @@ from django.utils.encoding import smart_str from django.utils.safestring import mark_safe from django.db.models.sql.query import LOOKUP_SEP -from django.db.models.related import RelatedObject from django.utils.translation import ugettext as _ from django.db import models + from xadmin.sites import site from xadmin.views import BaseAdminPlugin, ListAdminView, CreateAdminView, UpdateAdminView, DeleteAdminView +from xadmin.util import is_related_field2 RELATE_PREFIX = '_rel_' @@ -24,7 +25,7 @@ def get_related_list(self): return self._related_acts _related_acts = [] - for r in self.opts.get_all_related_objects() + self.opts.get_all_related_many_to_many_objects(): + for r in list(self.opts.get_fields()) + list(self.opts.get_fields()): if self.related_list and (r.get_accessor_name() not in self.related_list): continue if r.model not in self.admin_site._registry.keys(): @@ -93,9 +94,9 @@ def __init__(self, admin_view, lookup, value): self.value = value parts = lookup.split(LOOKUP_SEP) - field = self.opts.get_field_by_name(parts[0])[0] + field = self.opts.get_field(parts[0]) - if not hasattr(field, 'rel') and not isinstance(field, RelatedObject): + if not is_related_field2(field): raise Exception(u'Relate Lookup field must a related field') if hasattr(field, 'rel'): @@ -128,7 +129,7 @@ class BaseRelateDisplayPlugin(BaseAdminPlugin): def init_request(self, *args, **kwargs): self.relate_obj = None - for k, v in self.request.REQUEST.items(): + for k, v in self.request.GET.items(): if smart_str(k).startswith(RELATE_PREFIX): self.relate_obj = RelateObject( self.admin_view, smart_str(k)[len(RELATE_PREFIX):], v) diff --git a/xadmin/plugins/sortable.py b/xadmin/plugins/sortable.py index 8806eeaf8..adc97309b 100644 --- a/xadmin/plugins/sortable.py +++ b/xadmin/plugins/sortable.py @@ -30,7 +30,7 @@ def block_top_toolbar(self, context, nodes): # 'selected': str(r) == current_refresh, # } for r in self.refresh_times], # }) - # nodes.append(loader.render_to_string('xadmin/blocks/refresh.html', context_instance=context)) + # nodes.append(loader.render_to_string('xadmin/blocks/refresh.html', request=context.request)) site.register_plugin(SortablePlugin, ListAdminView) diff --git a/xadmin/plugins/topnav.py b/xadmin/plugins/topnav.py index daa58bd9b..c92fce549 100644 --- a/xadmin/plugins/topnav.py +++ b/xadmin/plugins/topnav.py @@ -41,8 +41,7 @@ def block_top_navbar(self, context, nodes): }) except NoReverseMatch: pass - - nodes.append(loader.render_to_string('xadmin/blocks/comm.top.topnav.html', {'search_models': search_models, 'search_name': SEARCH_VAR})) + return nodes.append(loader.render_to_string('xadmin/blocks/comm.top.topnav.html', {'search_models': search_models, 'search_name': SEARCH_VAR})) def block_top_navmenu(self, context, nodes): add_models = [] diff --git a/xadmin/plugins/wizard.py b/xadmin/plugins/wizard.py index d354f69cd..213801538 100644 --- a/xadmin/plugins/wizard.py +++ b/xadmin/plugins/wizard.py @@ -1,11 +1,11 @@ import re +from collections import OrderedDict from django import forms from django.db import models from django.template import loader -from django.contrib.formtools.wizard.storage import get_storage -from django.contrib.formtools.wizard.forms import ManagementForm -from django.contrib.formtools.wizard.views import StepsHelper -from django.utils.datastructures import SortedDict +from formtools.wizard.storage import get_storage +from formtools.wizard.forms import ManagementForm +from formtools.wizard.views import StepsHelper from django.forms import ValidationError from django.forms.models import modelform_factory from xadmin.sites import site @@ -36,7 +36,7 @@ def _get_form_prefix(self, step=None): def get_form_list(self): if not hasattr(self, '_form_list'): - init_form_list = SortedDict() + init_form_list = OrderedDict() assert len( self.wizard_form_list) > 0, 'at least one form is needed' diff --git a/xadmin/plugins/xversion.py b/xadmin/plugins/xversion.py index 680561cce..ef4e1508f 100644 --- a/xadmin/plugins/xversion.py +++ b/xadmin/plugins/xversion.py @@ -1,9 +1,8 @@ -from django.contrib.contenttypes.generic import GenericRelation +from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.models import ContentType from django.core.exceptions import PermissionDenied from django.db import models from django.db.models.query import QuerySet -from django.db.models.related import RelatedObject from django.forms.models import model_to_dict from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 @@ -17,7 +16,7 @@ from xadmin.plugins.actions import BaseActionView from xadmin.plugins.inline import InlineModelAdmin from xadmin.sites import site -from xadmin.util import unquote, quote, model_format_dict +from xadmin.util import unquote, quote, model_format_dict,is_related_field from xadmin.views import BaseAdminPlugin, ModelAdminView, CreateAdminView, UpdateAdminView, DetailAdminView, ModelFormAdminView, DeleteAdminView, ListAdminView from xadmin.views.base import csrf_protect_m, filter_hook from xadmin.views.detail import DetailAdminUtil @@ -53,7 +52,10 @@ def _register_model(admin, model): ct_field = getattr(inline, 'ct_field', 'content_type') ct_fk_field = getattr(inline, 'ct_fk_field', 'object_id') for field in model._meta.many_to_many: - if isinstance(field, GenericRelation) and field.rel.to == inline_model and field.object_id_field_name == ct_fk_field and field.content_type_field_name == ct_field: + if isinstance(field, GenericRelation) \ + and field.rel.to == inline_model \ + and field.object_id_field_name == ct_fk_field \ + and field.content_type_field_name == ct_field: inline_fields.append(field.name) _autoregister(admin, inline_model) else: @@ -64,8 +66,7 @@ def _register_model(admin, model): fk_name = field.name _autoregister(admin, inline_model, follow=[fk_name]) if not inline_model._meta.get_field(fk_name).rel.is_hidden(): - accessor = inline_model._meta.get_field( - fk_name).related.get_accessor_name() + accessor = inline_model._meta.get_field(fk_name).remote_field.get_accessor_name() inline_fields.append(accessor) _autoregister(admin, model, inline_fields) @@ -330,7 +331,7 @@ def post(self, request, object_id, *args, **kwargs): obj_b, detail_b = self.get_version_object(version_b) for f in (self.opts.fields + self.opts.many_to_many): - if isinstance(f, RelatedObject): + if is_related_field(f): label = f.opts.verbose_name else: label = f.verbose_name diff --git a/xadmin/sites.py b/xadmin/sites.py index 222dbaf6f..e48ab2a8b 100644 --- a/xadmin/sites.py +++ b/xadmin/sites.py @@ -181,12 +181,12 @@ def admin_view(self, view, cacheable=False): class MyAdminSite(AdminSite): def get_urls(self): - from django.conf.urls import patterns, url + from django.conf.urls import url urls = super(MyAdminSite, self).get_urls() - urls += patterns('', + urls += [ url(https://github.com/r'%5Emy_view/),%20self.admin_view(some_view)) - ) + ] return urls By default, admin_views are marked non-cacheable using the @@ -280,7 +280,7 @@ def create_model_admin_view(self, admin_view_class, model, option_class): return self.get_view_class(admin_view_class, option_class).as_view() def get_urls(self): - from django.conf.urls import patterns, url, include + from django.conf.urls import url, include from xadmin.views.base import BaseAdminView if settings.DEBUG: @@ -292,17 +292,15 @@ def wrapper(*args, **kwargs): return update_wrapper(wrapper, view) # Admin-site-wide views. - urlpatterns = patterns('', - url(r'^jsi18n/$', wrap(self.i18n_javascript, - cacheable=True), name='jsi18n') - ) + urlpatterns = [ + url(https://github.com/r'%5Ejsi18n/),%20wrap(self.i18n_javascript,%20cacheable=True), name='jsi18n') + ] # Registed admin views - urlpatterns += patterns('', - *[url( - path, wrap(self.create_admin_view(clz_or_func)) if type(clz_or_func) == type and issubclass(clz_or_func, BaseAdminView) else include(clz_or_func(self)), - name=name) for path, clz_or_func, name in self._registry_views] - ) + urlpatterns += [ + url(https://github.com/path,%20wrap(self.create_admin_view(clz_or_func)) if type(clz_or_func) == type and issubclass(clz_or_func, BaseAdminView) else include(clz_or_func(self)), + name=name) for path, clz_or_func, name in self._registry_views + ] # Add in each model's views. for model, admin_class in self._registry.iteritems(): @@ -311,12 +309,9 @@ def wrapper(*args, **kwargs): self.create_model_admin_view(clz, model, admin_class)), name=name % (model._meta.app_label, model._meta.model_name)) for path, clz, name in self._registry_modelviews] - urlpatterns += patterns('', - url( - r'^%s/%s/' % ( - model._meta.app_label, model._meta.model_name), - include(patterns('', *view_urls))) - ) + urlpatterns += [ + url(https://github.com/r'%5E%s/%s/'%20%%20(%20model._meta.app_label,%20model._meta.model_name), include(view_urls)) + ] return urlpatterns diff --git a/xadmin/templates/xadmin/500.html b/xadmin/templates/xadmin/500.html index b437c1aed..ee94582c2 100644 --- a/xadmin/templates/xadmin/500.html +++ b/xadmin/templates/xadmin/500.html @@ -1,6 +1,6 @@ {% extends base_template %} {% load i18n %} -{% load url from future %} + {% block breadcrumbs %}
    diff --git a/xadmin/templates/xadmin/auth/password_reset/complete.html b/xadmin/templates/xadmin/auth/password_reset/complete.html index f96bc5ece..d5971fd09 100644 --- a/xadmin/templates/xadmin/auth/password_reset/complete.html +++ b/xadmin/templates/xadmin/auth/password_reset/complete.html @@ -1,6 +1,6 @@ {% extends base_template %} {% load i18n xadmin_tags %} -{% load url from future %} + {% load crispy_forms_tags %} {% block body %} diff --git a/xadmin/templates/xadmin/auth/password_reset/confirm.html b/xadmin/templates/xadmin/auth/password_reset/confirm.html index d1c0fb1ec..73cb26e8b 100644 --- a/xadmin/templates/xadmin/auth/password_reset/confirm.html +++ b/xadmin/templates/xadmin/auth/password_reset/confirm.html @@ -1,6 +1,6 @@ {% extends base_template %} {% load i18n xadmin_tags %} -{% load url from future %} + {% load crispy_forms_tags %} {% block body %} diff --git a/xadmin/templates/xadmin/auth/password_reset/done.html b/xadmin/templates/xadmin/auth/password_reset/done.html index 2681b54e3..185063799 100644 --- a/xadmin/templates/xadmin/auth/password_reset/done.html +++ b/xadmin/templates/xadmin/auth/password_reset/done.html @@ -1,6 +1,6 @@ {% extends base_template %} {% load i18n xadmin_tags %} -{% load url from future %} + {% load crispy_forms_tags %} {% block body %} diff --git a/xadmin/templates/xadmin/auth/password_reset/email.html b/xadmin/templates/xadmin/auth/password_reset/email.html index a590a1317..e9217bf31 100644 --- a/xadmin/templates/xadmin/auth/password_reset/email.html +++ b/xadmin/templates/xadmin/auth/password_reset/email.html @@ -1,4 +1,4 @@ -{% load i18n %}{% load url from future %}{% autoescape off %} +{% load i18n %}{% autoescape off %} {% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new password:" %} diff --git a/xadmin/templates/xadmin/auth/password_reset/form.html b/xadmin/templates/xadmin/auth/password_reset/form.html index 1c3a38da3..08da11874 100644 --- a/xadmin/templates/xadmin/auth/password_reset/form.html +++ b/xadmin/templates/xadmin/auth/password_reset/form.html @@ -1,6 +1,6 @@ {% extends base_template %} {% load i18n xadmin_tags %} -{% load url from future %} + {% load crispy_forms_tags %} {% block body %} diff --git a/xadmin/templates/xadmin/auth/user/change_password.html b/xadmin/templates/xadmin/auth/user/change_password.html index 6a93649b0..7dde9741c 100644 --- a/xadmin/templates/xadmin/auth/user/change_password.html +++ b/xadmin/templates/xadmin/auth/user/change_password.html @@ -1,6 +1,6 @@ {% extends "xadmin/views/model_form.html" %} {% load i18n %} -{% load url from future %} + {% load xadmin_tags %} {% load crispy_forms_tags %} diff --git a/xadmin/templates/xadmin/base.html b/xadmin/templates/xadmin/base.html index 09488dc57..b1a868d15 100644 --- a/xadmin/templates/xadmin/base.html +++ b/xadmin/templates/xadmin/base.html @@ -1,4 +1,4 @@ -{% load url from future %}{% load xadmin_tags %}{% load i18n %} +{% load xadmin_tags %}{% load i18n %} diff --git a/xadmin/templates/xadmin/base_site.html b/xadmin/templates/xadmin/base_site.html index 7822446df..573818da0 100644 --- a/xadmin/templates/xadmin/base_site.html +++ b/xadmin/templates/xadmin/base_site.html @@ -1,8 +1,5 @@ {% extends 'xadmin/base.html' %} {% load i18n xadmin_tags %} -{% load url from future %} -{% load firstof from future %} - {% block title %}{{ title }} | {{ site_title }}{% endblock %} {% block body %} diff --git a/xadmin/templates/xadmin/blocks/comm.top.setlang.html b/xadmin/templates/xadmin/blocks/comm.top.setlang.html index b648336dc..471919bb5 100644 --- a/xadmin/templates/xadmin/blocks/comm.top.setlang.html +++ b/xadmin/templates/xadmin/blocks/comm.top.setlang.html @@ -1,5 +1,5 @@ {% load i18n xadmin_tags %} -{% load url from future %} +
  • diff --git a/xadmin/templates/xadmin/blocks/comm.top.topnav.html b/xadmin/templates/xadmin/blocks/comm.top.topnav.html index ea045aece..b145414c8 100644 --- a/xadmin/templates/xadmin/blocks/comm.top.topnav.html +++ b/xadmin/templates/xadmin/blocks/comm.top.topnav.html @@ -1,4 +1,5 @@ {% load i18n xadmin_tags %} +{% autoescape off %} {% if search_models %}
    @@ -26,4 +27,5 @@ {% endfor %}
    • -{% endif %} \ No newline at end of file +{% endif %} +{% endautoescape %} diff --git a/xadmin/templates/xadmin/includes/sitemenu_accordion.html b/xadmin/templates/xadmin/includes/sitemenu_accordion.html index dde88a954..df80f12f1 100644 --- a/xadmin/templates/xadmin/includes/sitemenu_accordion.html +++ b/xadmin/templates/xadmin/includes/sitemenu_accordion.html @@ -1,6 +1,6 @@ {% extends 'xadmin/includes/sitemenu_default.html' %} {% load i18n xadmin_tags %} -{% load url from future %} + {% block navbar_md %}