Compare commits

..

871 commits
0.2.0 ... main

Author SHA1 Message Date
Jannis Leidel
7770da8a49
Merge pull request #479 from jazzband/jazzband/sync/default
Jazzband: Synced file(s) with jazzband/.github
2021-10-22 17:46:32 +02:00
jazzband-bot
bbfa3daa0c Jazzband: Created local 'CODE_OF_CONDUCT.md' from remote 'CODE_OF_CONDUCT.md' 2021-10-21 14:33:45 +00:00
Asif Saif Uddin
933489a491 remove python 2 style codes 2021-10-17 17:09:23 +06:00
Asif Saif Uddin
2a5156005b remove python 2 style codes 2021-10-17 17:09:23 +06:00
Asif Saif Uddin
ca28d88c88 remove python 2 style super call from utils 2021-10-17 17:09:23 +06:00
Asif Saif Uddin
9227439625 remove python 2 style super call and explicit object inheritance from viewmixins 2021-10-17 17:09:23 +06:00
Asif Saif Uddin
78112a85bd remove python 2 style super call and explicit object inheritance 2021-10-17 17:09:23 +06:00
Asif Saif Uddin
951c7e5bcf
update python 3 (#477)
* update python 3

* modify django-filter to 2.4.0
2021-10-17 14:21:02 +06:00
Asif Saif Uddin
5608ae91ea add django 3.2 on the matrix and remove 3.0 as EOL 2021-10-17 13:24:17 +06:00
Jannis Leidel
8cee4de75d
Merge pull request #475 from jazzband/master-to-main
Rename Django's dev branch to main.
2021-03-09 18:36:51 +01:00
Jannis Leidel
f5ee0d12c3
Fix for recent Django. 2021-03-09 13:14:40 +01:00
Jannis Leidel
245b5911e6
More Django fixes. 2021-03-09 12:44:05 +01:00
Jannis Leidel
39c6d80b7b
Don't run tests against Django main on 3.7. 2021-03-09 12:38:08 +01:00
Jannis Leidel
2c6e5f004a
Fix compat issue. 2021-03-09 12:33:11 +01:00
Jannis Leidel
f893867652
Rename own develop branch to main. 2021-03-09 12:29:02 +01:00
Jannis Leidel
9025d59308
Rename Django's dev branch to main.
More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/
Refs: https://github.com/django/django/pull/14048
2021-03-09 12:25:05 +01:00
Jannis Leidel
5fa2670643
Fix badges. 2020-11-25 21:12:03 +01:00
Jannis Leidel
acc36d9e3e
Merge pull request #474 from jazzband/gha
Migrate to GitHub Actions.
2020-11-25 20:40:15 +01:00
Jannis Leidel
d76590de4c
Enable Jazzband releases. 2020-11-25 20:32:29 +01:00
Jannis Leidel
eba98f9cae
Add coverage tracking. 2020-11-25 20:25:26 +01:00
Jannis Leidel
65c7f21730
Initial GitHub Actions test workflow. 2020-11-25 20:20:05 +01:00
Kamil Gałuszka
c59a19f336 feat: upgrade Django and Python to supported versions 2020-11-21 22:16:43 +06:00
Tim Gates
49f569cc6c
docs: Fix simple typo, taht -> that (#471)
There is a small typo in djadmin2/filters.py.

Should read `that` rather than `taht`.
2020-03-04 16:06:19 +01:00
Asif Saif Uddin
08867d7e13
updated django rest framework 2019-03-18 01:21:42 +06:00
Asif Saif Uddin
c724c332c6 django-filter rest backend global 2018-11-02 21:27:04 +06:00
Asif Saif Uddin
fbd1ab5931 static tag 2018-11-02 21:27:04 +06:00
Asif Saif Uddin
74788d96ff inlineformset deprecation warning fixed 2018-11-02 21:27:04 +06:00
Asif Saif Uddin
09ed44fe56 regex depr 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
5425e37524 static 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
ccdbfdd013 settings changes 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
93a7a213df settings changes 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
673b0f8eb6 change setenv 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
fbd3caf0e3 admin tests only 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
77ed1eb117 disable example apps testing 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
58f38b55cd static 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
bfe2a8b207 pinned django-filter to 1.1.0 for now 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
26727eb2a5 update required packages 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
ddc1e39cea stop flake8 check on travis 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
7ea3d7fc28 updated requirements version 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
439f250423 updated travis matrix 2018-11-02 15:44:25 +06:00
Asif Saif Uddin
69d0387b6d repalce staticfiles with static 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
32f5c93c84 added paginate_by attr to example blogListView 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
6473fbea4d fixed typo 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
c056ad816e django-filters to installed apps 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
769bd37a9a django-filters widget changes revert 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
9d7286b5aa django-filters widget 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
a7be23c4d9 django-filters 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
3c20e75a0d django-filters 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
bdfcc5a65b revert 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
18c8c95443 class based Login and logout views 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
563a330db1 fixed deprecation warning in core 2018-10-23 18:27:41 +06:00
Asif Saif Uddin
78e18161dc
Merge pull request #464 from jazzband/master
fixed static
2018-10-23 15:00:53 +06:00
Asif Saif Uddin
85a5d3b291 fixed deprecation warning in example blog filters test 2018-10-23 14:48:35 +06:00
Asif Saif Uddin
e8bde774cf fixed deprecation warning in views tests 2018-10-23 14:43:45 +06:00
Asif Saif Uddin
f60fb8530c fixed deprecation warning in utils tests 2018-10-23 14:42:16 +06:00
Asif Saif Uddin
18d0d18edd fixed deprecation warning in types tests 2018-10-23 14:41:54 +06:00
Asif Saif Uddin
c4462f79d2 fixed deprecation warning in core tests 2018-10-23 14:37:39 +06:00
Asif Saif Uddin
ffb7f2d595 fixed deprecation warning in admin2tags tests 2018-10-23 14:35:06 +06:00
Asif Saif Uddin
09545a663e fixed pep8 errors 2018-10-23 14:33:21 +06:00
Asif Saif Uddin
0cbaf7f089 fixed deprecation warning it test_actions 2018-10-23 14:32:57 +06:00
Asif Saif Uddin
b285164379 fixed pep8 errors 2018-10-23 13:42:09 +06:00
Asif Saif Uddin
7a754a3469 fixed missing imports 2018-10-23 13:38:37 +06:00
Asif Saif Uddin
2f1959b43e fixed static 2018-10-23 13:05:17 +06:00
Asif Saif Uddin (Auvi)
2473fa3069
fix deprecation warnings (#463)
* fix deprecation warning

* fix deprecation warning

* fix deprecation warning of django filter

* fix deprecation warning of django filter widget

* undo widget

* fixed field_name deprecation warning

* fixed pagination error

* fixed pagination error
2018-09-17 13:58:30 +06:00
Asif Saif Uddin (Auvi)
f212393331
Merge pull request #462 from auvipy/up
Update
2018-09-03 16:12:45 +06:00
Asif Saif Uddin
8636f6ce98 template dir settings 2018-09-03 14:54:37 +06:00
Asif Saif Uddin
6ae2354d2a removed SessionAuthenticationMiddleware 2018-09-03 14:42:29 +06:00
Asif Saif Uddin
8169c11e31 fixed url erros 2018-09-03 14:25:27 +06:00
Asif Saif Uddin
2091f9649d fixed is_authenticated error 2018-09-03 14:13:10 +06:00
Asif Saif Uddin
6263f2a340 fixed lint error 2018-09-03 13:45:27 +06:00
Asif Saif Uddin
647260dfb7 fixed migrations on_delete argument warning 2018-09-03 13:38:39 +06:00
Asif Saif Uddin
5f0c3c323d fixed url includes deprecation warning 2018-09-03 13:37:47 +06:00
Asif Saif Uddin
75c7d4180a updated tox with newer versions 2018-09-03 11:38:31 +06:00
Asif Saif Uddin
68eb9c7c59 updated urls reverse import 2018-09-03 11:31:48 +06:00
Asif Saif Uddin
394b04c2f9 updated authors 2018-09-03 11:20:28 +06:00
Asif Saif Uddin
5d4ba598d7 updated travis matrix 2018-09-03 11:15:12 +06:00
Asif Saif Uddin
d44f64f3fd update django-fillter to 1.1 2018-09-03 11:11:41 +06:00
Asif Saif Uddin
26fc9ff235 update readme 2018-09-03 11:11:14 +06:00
Asif Saif Uddin
cfe9c1ffa2 update setup.py 2018-09-03 11:07:32 +06:00
Asif Saifuddin Auvi
606118cb04
Merge pull request #458 from auvipy/up
start work to support 1.11 and 2.0
2018-05-11 02:02:17 +06:00
Asif Saifuddin Auvi
27421081d4 fixed reverse reverse_lazy import errors 2018-05-11 01:23:23 +06:00
Asif Saifuddin Auvi
90713245bc added .pytest_cache to gitignore 2018-05-11 01:21:51 +06:00
Asif Saifuddin Auvi
b01ff0b2f6 style fix 2018-05-11 01:17:37 +06:00
Asif Saifuddin Auvi
f86f5a1ee2 add on_delete positional arg to related fields 2018-05-11 00:49:17 +06:00
Asif Saifuddin Auvi
be3a67b9c5 add on_delete positional arg to related fields 2018-05-11 00:36:28 +06:00
Asif Saifuddin Auvi
4a715d95c0 add on_delete positional arg to related fields 2018-05-11 00:34:03 +06:00
Asif Saifuddin Auvi
33b41fa311 add on_delete positional arg to related fields 2018-05-10 23:58:25 +06:00
Asif Saifuddin Auvi
e3822dee39 fix pep8 errors 2018-05-10 23:23:37 +06:00
Asif Saifuddin Auvi
e7200b7b65 update MIDDLEWARE settings 2018-05-10 23:23:18 +06:00
Asif Saifuddin Auvi
cce430242c fix pep8 errors 2018-05-10 23:15:01 +06:00
Asif Saifuddin Auvi
2c73396391 fix typo in tox 2018-05-10 23:05:17 +06:00
Asif Saifuddin Auvi
c8a4153a4d revert 2018-05-10 22:54:47 +06:00
Asif Saifuddin Auvi
9db0b200ff remove init.py from from tests folder to fix import issues 2018-05-10 22:42:49 +06:00
Asif Saifuddin Auvi
aac3e1062b modify travis 2018-05-10 22:31:01 +06:00
Asif Saifuddin Auvi
c34a0dab19 fixed flake8 errors 2018-05-10 22:22:00 +06:00
Asif Saifuddin Auvi
cf822c745b updated travis 2018-05-10 22:15:00 +06:00
Asif Saifuddin Auvi
28702ef165 dropped dj 1.8 & 1.9 from tox and added 2.0 2018-05-10 22:09:01 +06:00
Asif Saifuddin Auvi
18fae8d5ed update dependencies 2018-05-10 21:58:56 +06:00
Asif Saifuddin Auvi
dcb43cdb02 added dj1.11 in tox 2017-03-20 17:10:42 +06:00
Asif Saifuddin Auvi
4aa18f3a8d added dj1.11 to travis 2017-03-20 16:33:00 +06:00
Asif Saifuddin Auvi
f8bd4be24c added dj1.11 to travis 2017-03-20 16:32:33 +06:00
Asif Saifuddin Auvi
1054fb25fd added dj1.11 to tox 2017-03-20 16:27:50 +06:00
Asif Saifuddin Auvi
2b5c180792 update 0.7.1 tag for release 2017-01-10 23:43:07 +06:00
Andrews Medina
a95e211d65 add compatibility with last version of deps (#454) 2016-11-29 23:16:39 +06:00
Asif Saifuddin Auvi
b20ec951c3 update minor versions (#453)
and check what fails to fix them incrementally for 0.7.1 release
2016-11-27 17:37:29 +06:00
Asif Saifuddin Auvi
047ed08a8a update history for 0.7.0 2016-11-15 22:47:46 +06:00
Asif Saifuddin Auvi
a10ff4637b update version to 0.7.0 2016-11-15 22:10:33 +06:00
Andrews Medina
1d43c71829 Fix tests (#448)
* tox: disable development mode

* fix django-extra-views and djangorestframework versions

* using get_field instead get_field_by_name

to fix compatibility with Django 1.10

* travis: dont test Django 1.10 with Python 3.3
2016-11-13 11:47:08 +06:00
Asif Saifuddin Auvi
4d7b7e6fb0 updated required dependencies (#444) 2016-11-07 21:02:16 +06:00
Asif Saifuddin Auvi
0239a1b96a added django 1.10 to travis 2016-09-03 15:27:40 +06:00
Asif Saifuddin Auvi
d4065666c6 added django 1.10 to tox 2016-09-03 15:25:29 +06:00
arthur-wsw
8d41a222b7 Hardcoded LoginView (#436)
* Add a way to customize LoginView and Document about it

Resolve #416

* Add test for custom login view

* Remove unused code in test_views
2016-09-03 15:17:37 +06:00
Jannis Leidel
fdcdf5a484 Fixed Coveralls badge URLs. 2016-06-24 14:50:52 +02:00
Jannis Leidel
a2a657aa40 Enabled auto PyPI release on git tags. 2016-06-24 14:48:15 +02:00
Kamil Gałuszka
28cefe56c3 Merge pull request #441 from jazzband/jazzband-move
Fix links to new home in the Jazzband.
2016-06-08 20:50:15 +02:00
Jannis Leidel
c771d1a71a Fix links to new home in the Jazzband. 2016-06-08 20:26:19 +02:00
Andrews Medina
b50ede9f6f Merge pull request #440 from adamchainz/readthedocs.io
Convert readthedocs links for their .org -> .io migration for hosted projects
2016-06-08 01:30:45 -03:00
Adam Chainz
1187eb8709 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-06-08 04:07:57 +01:00
Andrews Medina
59d95693b7 Merge pull request #439 from arthur-wsw/url_patterns
Remove deprecated django.conf.urls. patterns from docs
2016-06-08 00:04:25 -03:00
Daniel Roy Greenfeld
fe52529ceb Update CONTRIBUTING.rst 2016-06-07 12:12:19 -07:00
Daniel Roy Greenfeld
1e8a6e495b Update CONTRIBUTING.rst 2016-06-07 12:12:06 -07:00
Daniel Roy Greenfeld
9224d937d3 Added code of conduct
Required for potentially moving to @jazzband and is also a good thing to have in any project.
2016-06-07 12:01:12 -07:00
arthur
9f95eb13ef Remove deprecated django.conf.urls. patterns from docs 2016-06-07 13:45:16 +02:00
Andrews Medina
ddd126abfc Merge pull request #437 from arthur-wsw/docs
Fix documentation examples
2016-06-06 21:37:55 -03:00
Andrews Medina
59197a4713 Merge pull request #438 from arthur-wsw/screenshots
Update admin and admin2 screenshots
2016-06-06 21:37:08 -03:00
arthur
74103e2100 Update screenshots 2016-06-06 15:33:19 +02:00
arthur
5261650544 Update admin and admin2 screenshots 2016-06-06 14:20:34 +02:00
arthur
8e8b48a3f2 Fix documentation examples 2016-06-06 11:52:27 +02:00
Andrews Medina
19dac42021 Merge pull request #435 from pydanny/requires-io-develop
[requires.io] dependency update on develop branch
2016-06-05 23:09:55 -03:00
requires.io
2399dad123 [requires.io] dependency update 2016-06-05 16:29:40 -07:00
Kamil Gałuszka
611f44aa85 Merge pull request #434 from arthur-wsw/bootstrap3
New bootstrap3 default theme + Remove django-crispy-forms and django-floppyforms
2016-06-02 14:51:07 +02:00
arthur
da8b7ad73c Fix installation instruction in README and documentation 2016-05-28 02:15:22 +02:00
arthur
24a8be2d1d Revert unwanted tox changes
Update docs to keep both migration from 0.5 and 0.6
2016-05-27 11:32:20 +02:00
arthur
7f2ae25920 Removing django-crispy-forms and django-floppyforms
Resolve #433 #343
2016-05-26 19:14:39 +02:00
arthur
0d401c2b9a Remove CDN import in favor of static one 2016-05-26 14:21:10 +02:00
arthur
bd35ffc676 Update default theme to a bootstrap3 theme based on http://startbootstrap.com/template-overviews/sb-admin-2/
Resolve #360
2016-05-26 11:34:21 +02:00
Kamil Gałuszka
f3dc001f3a Merge pull request #432 from arthur-wsw/no_eggs
No eggs
2016-05-25 22:44:08 +02:00
arthur
36e8889f84 Add .eggs in .gitignore 2016-05-25 22:30:48 +02:00
arthur
b1bf34bdd2 Delete .egs 2016-05-25 22:29:31 +02:00
Kamil Gałuszka
d9b3d2c8a6 Merge pull request #431 from arthur-wsw/django_1_8
Django 1.8 and 1.9 compatibility
2016-05-25 09:55:49 +02:00
arthur
38198c2d9f Update History 2016-05-22 15:15:13 +02:00
arthur
336bb3753d Update flake8 requirements 2016-05-22 15:07:08 +02:00
arthur
73b95eaa70 Add myself in contributors 2016-05-22 15:06:31 +02:00
arthur
fb05f25084 Update docs 2016-05-22 15:06:02 +02:00
arthur
7d2f5b1251 Test travis config to allow failures for django master 2016-05-22 14:52:05 +02:00
arthur
4bcc02f735 Add future in requirements to fix python2 compatibility 2016-05-22 14:43:35 +02:00
arthur
23c256d6a0 Remove import from django.conf.urls.patterns 2016-05-22 14:38:41 +02:00
arthur
3b09d8b02d Fix lasts tests 2016-05-22 14:32:38 +02:00
arthur
e9db0de137 New way to invalidate the users permission cache in test by loading user from database 2016-05-22 14:23:51 +02:00
arthur
49523a3ae8 Update session hach only if user is logged user 2016-05-22 11:45:08 +02:00
arthur
986d7e7fea Replace DATE_FORMAT with %Y-%m-%d in floppyforms tests because it has been hardcoded since 1.3 because it is required by the W3C HTML5 specification.
53d1d8a8d7
2016-05-22 11:28:10 +02:00
arthur
23ea5d6065 Fix update password view 2016-05-22 11:10:33 +02:00
arthur
702b3cd611 Fix flake8 2016-05-22 10:52:43 +02:00
arthur
39d02f4190 Fix no logout on update password for current user 2016-05-22 10:49:09 +02:00
arthur
e74593d4b4 Use DRF PageNumberPagination to finish fixing DRF tests 2016-05-22 10:20:17 +02:00
arthur
829840f411 Fix model migrations 2016-05-20 10:54:42 +02:00
arthur
37be02f1c6 New example settings generated from django 1.9
Serve media for better manual testing
2016-05-20 10:30:07 +02:00
arthur
00522b6c9e Fix test_apiviews (remove a space) 2016-05-20 09:20:01 +02:00
arthur
fdc5563cba Fix permissions error 2016-05-20 09:19:41 +02:00
arthur
fdd938b1ac Flake8 in apiviews 2016-05-19 20:07:45 +02:00
arthur
eafe2ac7c1 Update DRF 3 2016-05-19 20:06:53 +02:00
arthur
f0a5ac67e4 Fix flake8 2016-05-19 19:27:02 +02:00
arthur
a373875c0d Set return of get_update password_url to default value in UserChangeFrom when no instance 2016-05-19 19:21:56 +02:00
arthur
5511b4dc8d Fix password link in user 2016-05-19 18:50:56 +02:00
arthur
d9a6da6e52 Try fix for some blog test 2016-05-19 18:27:41 +02:00
arthur
830bffcf11 Using TextField widget for GenericIPAddressField according to django-floppyforms documentation
http://django-floppyforms.readthedocs.io/en/latest/widgets.html
2016-05-19 18:16:01 +02:00
arthur
0b923103f3 Replace IPAddressField with GenericIPAddressField 2016-05-19 17:05:21 +02:00
arthur
e7df67e150 Update create_view_permission and move signal to AppConfig 2016-05-08 02:22:49 +02:00
arthur
41133b2b9c Fix imports 2016-05-08 01:38:44 +02:00
arthur
babe7a70c7 Optimise imports 2016-05-08 01:31:16 +02:00
arthur
23f7f9479a create a djadmin2_site in djadmin2/site.py to make it work in django 1.9 2016-05-08 01:29:17 +02:00
arthur
754f5dab56 Replace post_sync signal with post_migrate 2016-05-08 00:54:04 +02:00
arthur
f223b85422 Rename AdminModel2Mixin to Admin2ModelMixin 2016-05-08 00:25:12 +02:00
arthur
92e7d52c47 rename ctype to c_type (flake8 on python2.7) 2016-05-08 00:18:16 +02:00
arthur
cb91aabcf4 Update permission.py 2016-05-08 00:12:53 +02:00
arthur
54f710055a Add migrations but not use them in test for now 2016-05-07 23:59:55 +02:00
arthur
e7a40e1806 Update url patterns 2016-05-07 23:57:53 +02:00
arthur
3bf33946c6 Update tox.init 2016-05-07 23:29:25 +02:00
arthur
c532393b97 Fix flake8 errors 2016-05-07 23:28:30 +02:00
arthur
5849d80dcb Update django rest framework 2016-05-07 23:26:48 +02:00
arthur
f3ff443373 Fix flake8 errors 2016-05-07 22:59:15 +02:00
arthur
f5701e5c15 Update tox and travis configuration with flake8 support 2016-05-07 22:58:56 +02:00
arthur
d3d3fbe991 Add django 1.8 setup 2016-05-07 22:51:22 +02:00
arthur
5bd01187d4 Fix nested object test 2016-05-07 21:36:43 +02:00
arthur
77fd9401bb Add field_name attribute for build_date_filter 2016-05-07 21:09:58 +02:00
arthur
9872521f6f Fix collector in BaseListAction who generate bug when trying to delete multiple object from action list 2016-05-07 21:09:22 +02:00
arthur
3fbc396fa2 Fix slice has been taken issue on _format_days, _format_months and _format_years 2016-05-07 21:07:51 +02:00
arthur
8189b9cfaa Update django-floppyforms and django-filter 2016-05-07 20:28:41 +02:00
arthur
5f9707e467 Delete migration for tox to work 2016-05-07 20:28:04 +02:00
arthur
4bdaba8932 Add .cache in gitignore 2016-05-07 20:24:21 +02:00
arthur
599ec2d236 Add migrations 2016-05-07 19:44:00 +02:00
arthur
c7ddb60c3b Add .idea in PyCharm 2016-05-07 19:43:42 +02:00
Kamil Gałuszka
ac531c3941 Merge pull request #428 from andrewsmedina/fix_django_filter
pin django-filter version to < 0.12.0
2016-03-15 20:39:43 +01:00
Andrews Medina
cb9d43e86f pin django-filter version to < 0.12.0 2016-01-17 21:17:49 -02:00
Kamil Gałuszka
b2077ba4b8 Merge pull request #427 from andrewsmedina/allow_failures
travis: enabling Django 1.8 and 1.9 tests with allow_failures enabled
2016-01-16 23:49:49 +01:00
Andrews Medina
6b1f819770 travis: removing pypy3 for django 1.7 2016-01-02 14:17:20 -02:00
Andrews Medina
3632af362d travis: enabling Django 1.8 and 1.9 tests with allow_failures enabled 2016-01-02 14:01:42 -02:00
Andrews Medina
718b0b7524 fix rst format 2015-12-13 18:37:03 -02:00
Andrews Medina
03f4df0121 update Two Scoops of Django version 2015-12-13 18:35:18 -02:00
Andrews Medina
cbf1263593 remove crate.io badges 2015-12-13 18:33:33 -02:00
Andrews Medina
17641045e8 use new travis infrastructure 2015-12-13 18:28:33 -02:00
Andrews Medina
20b5b2ab72 Merge pull request #424 from hnakamur/use_static_template_tag
Use static template tag instead of STATIC_URL
2015-08-21 01:09:36 -03:00
Hiroaki Nakamura
25679c7fa3 Use static template tag instead of STATIC_URL 2015-08-21 10:27:35 +09:00
Kamil Gałuszka
d69729e52f Merge pull request #417 from montiniz/py3-fix
Raise syntax no longer accepts comma-separated arguments in python3
2015-03-30 22:53:44 +02:00
Kamil Gałuszka
eb3ba7e98a Merge pull request #419 from montiniz/django1.8-fixes
Django1.8 fixes
2015-03-30 20:40:55 +02:00
montiniz
afa944e5ff Updated tox for django1.8 testing 2015-03-30 13:09:33 -05:00
montiniz
03dea3c00b Fixed datetime_renderer to be compatible with django 1.8. Django ticket #23466 2015-03-30 12:50:08 -05:00
montiniz
8a51b321f3 django 1.8 fixes 2015-03-30 12:40:13 -05:00
Kamil Gałuszka
664aeb24ec Merge pull request #418 from shulcsm/develop
Fix some Django 1.8 compatibility issues.
2015-03-24 21:06:10 +01:00
montiniz
1802fce73d Added tests for ModelAdmin.get_urls 2015-03-21 12:55:06 -05:00
montiniz
de3905cd4b Raise syntax no longer accepts comma-separated arguments in python3 2015-03-21 12:48:10 -05:00
Koding
a51eb82f6b Fix some Django 1.8 compatibility issues. 2015-03-21 16:26:12 +00:00
Andrews Medina
a67db4c46a authors: added Germano Gabbianelli. 2015-01-11 17:33:44 -02:00
Andrews Medina
0649044717 Merge pull request #391 from douglasmiranda/fix-empty-form-message
Fix: "there are no" instead "there isn't" on the empty form message.
2015-01-10 18:43:13 -02:00
Andrews Medina
ff3cbd413a Merge pull request #386 from tyrion/patch-2
Fixed ModelAdminBase2 to allow overriding existent views.
2015-01-10 18:35:31 -02:00
Andrews Medina
b089a4027c Merge pull request #384 from tyrion/patch-1
"djadmin2theme_default" should not be hard-coded in templatetags.
2015-01-10 18:30:46 -02:00
Andrews Medina
59990bbef5 Merge pull request #403 from galuszkak/tox_tests
Many fixes to py3 support and django 1.7 compatybility
2015-01-08 15:54:53 -02:00
Kamil Gałuszka
7d86cfc000 Update AUTHORS.rst 2015-01-08 13:56:35 +01:00
Kamil Gałuszka
cde4de20c8 fixes to review by @andrewsmedina #403 2015-01-08 08:41:41 +01:00
Kamil Gałuszka
84ae23b903 fix problems with permissions 2015-01-06 18:29:29 +01:00
Kamil Gałuszka
d61b9922ce getting back to versions that tests are passing 2015-01-05 22:40:54 +01:00
montiniz
a6e7755a55 Fixes for compatibility with python3. 2014-11-26 09:42:17 -06:00
Andrews Medina
8809ae2089 Add gitter badget. 2014-11-10 00:45:54 -02:00
Kamil Gałuszka
dda1211f43 small fix compatybility for test and dj1.7 2014-10-10 22:19:05 -05:00
Kamil Gałuszka
836d85668e only 28 failing test on py3 :) 2014-10-10 22:19:05 -05:00
Kamil Gałuszka
a20c98d6d4 fixing next py3 problems... only 57 failing tests left. 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
e74c603bda fix for type in filters.py 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
6144278a9e fix for py3 basestring problem with six 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
03ebd91f78 fixing django 1.7 errors 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
2f43a66055 fixing possible errors on pypy2 2014-10-10 22:19:03 -05:00
Kamil Gałuszka
7e7542ef2b support django >=1.6 2014-10-10 22:19:03 -05:00
Kamil Gałuszka
84bf9f2073 fixing test with modelforms 2014-10-10 22:19:03 -05:00
Kamil Gałuszka
b341d763f0 many fixes to django-admin2 with py3
and django 1.7 compatybility
2014-10-10 22:19:02 -05:00
Kamil Gałuszka
d12f82d241 update to travis (removed comma typo) 2014-10-10 22:19:02 -05:00
Daniel Greenfeld
7032e19e2e Merge pull request #402 from galuszkak/tox_tests
added tox_tests
2014-09-17 11:38:38 -07:00
Kamil Gałuszka
3d79503b58 fix to TOX_ENV fail ;) 2014-09-17 20:31:19 +02:00
Kamil Gałuszka
d51069ade8 added tox_tests 2014-09-17 20:26:46 +02:00
Daniel Greenfeld
bd8cf8c686 Add @marangonico to authors. 2014-06-25 09:21:27 -07:00
Daniel Greenfeld
5ab2bad9a0 Merge pull request #399 from marangonico/patch-1
fix typo
2014-06-25 09:20:42 -07:00
Daniel Greenfeld
42808d5bb5 Add @amosson to contributors 2014-06-25 09:17:56 -07:00
Daniel Greenfeld
50df9addc2 Merge pull request #400 from amosson/develop
fix for django-braces>=1.4.0
2014-06-25 09:16:43 -07:00
Mosson, Andrew
5ff619979f fix for django-braces>=1.4.0
braces 1.3 views exported AccessMixin
in braces 1.4 this was moved views._access and not exported in views
not sure if this was the intent of braces or an oversight
if intent - should look at AccessMixin vs. using a more specific mixin

tested against django-braces 1.3.1 and django-braces 1.4.0
2014-06-19 10:12:13 -07:00
marangonico
f0e9db3ee5 fix typo 2014-06-19 08:59:56 +02:00
Daniel Greenfeld
92e58112eb Add two scoops icon 2014-03-04 17:59:55 -08:00
Daniel Greenfeld
c64aeee0ef Fix the tests 2014-02-26 12:55:42 -08:00
Daniel Greenfeld
2079a7be9b bump to 0.6.1 2014-02-26 10:21:56 -08:00
Daniel Greenfeld
b30f91e5b8 prep history for new release 2014-02-26 10:21:04 -08:00
Daniel Greenfeld
0b7c7dba8b Merge pull request #393 from BertrandBordage/patch-1
Adds png glyphicons to MANIFEST.
2014-02-08 23:04:02 -08:00
Bertrand Bordage
20e86a7a28 Adds png glyphicons to MANIFEST. 2014-02-08 16:33:58 +01:00
Douglas Miranda
af82d2b9b1 Fix: "there are no" instead "there isn't" on the empty form message. 2013-12-17 23:43:49 -03:00
Germano Gabbianelli
606db2fe7a Added tests for pull-request #386
1. Custom views should be prepended to the 'views' list, otherwise they
   could be shadowed by views of the superclass.
2. Custom views should not be added to the superclass 'views' list.
   Instead a new list should be created and assigned to the class.
2013-12-05 12:48:55 +01:00
Germano Gabbianelli
4c35c506a7 Fixed ModelAdminBase2 to allow overriding existent views. 2013-12-03 11:34:05 +01:00
Germano Gabbianelli
4a4b11176e "djadmin2theme_default" should not be hard-coded in templatetags. 2013-12-03 11:33:39 +01:00
Daniel Greenfeld
09fcceef13 Merge pull request #388 from gregmuellegger/django1.6fixes
Fixes for Django 1.6
2013-12-01 15:30:24 -08:00
Gregor Müllegger
4072d4c009 Fixing failing tests, that only occured on Travis. You cannot use a plane, generic View in the Admin since it always needs to be a model based one. At least unless you overwrite the get_*_kwargs method. 2013-11-28 18:11:12 +01:00
Gregor Müllegger
34b98fb8ac Better error messages for admin views that fail to instantiate. 2013-11-28 18:11:04 +01:00
Gregor Müllegger
930375e3b2 Remove deprecated setup_environ call from the docs configuration script. That made the documentation building fail for Django 1.6. Part of a Fix for #387. 2013-11-28 13:12:50 +01:00
Gregor Müllegger
ca86c60499 Django 1.6 changed the MultiWidget.needs_multipart_form attribute into a property. We didn't plan for that in floppify code yet. We check now for properties which makes it compatible with Django 1.6 and more futureproof. Part of a Fix for #387. 2013-11-28 13:12:50 +01:00
Gregor Müllegger
d9530074e4 Django 1.6 changed the widgets its using for IntegerFields, this needed adjustment in the floppifying rule for those fields. Part of a Fix for #387. 2013-11-28 13:12:50 +01:00
Gregor Müllegger
b8ab2e4408 Make sure that the urls.py is loaded before the tests are run. Django 1.6 doesn't guarantee this anymore. Part of a Fix for #387. 2013-11-28 12:03:08 +01:00
Daniel Greenfeld
d1f5e060f8 Add empty form fix to history. 2013-11-05 22:16:19 -08:00
Daniel Greenfeld
f66ac09bdf Merge pull request #378 from douglasmiranda/fix-empty-form
Fix empty form.
2013-11-05 22:12:41 -08:00
Douglas Miranda
2f8f890ce0 A nice margin for a nice message. :) 2013-09-27 00:52:51 -04:00
Douglas Miranda
b169d28653 Show a nice message if the have no visible fields. 2013-09-27 00:52:18 -04:00
Daniel Greenfeld
ee445acadf Merge pull request #377 from douglasmiranda/right-place-for-actions
Moving the unpublish_* actions to the right place.
2013-09-26 20:51:29 -07:00
Douglas Miranda
cd65542d03 moving the unpublish_* actions to the right place ( issue #277 ) 2013-09-26 23:42:42 -04:00
Daniel Greenfeld
a32fdb1f30 Merge pull request #375 from douglasmiranda/view-descriptions
Adding View Descriptions for "registry" and "app_verbose_names".
2013-09-25 16:06:44 -07:00
Douglas Miranda
ff721a2ef6 Adding View Descriptions for "registry" and "app_verbose_names". 2013-09-24 03:27:38 -04:00
Daniel Greenfeld
e694d23ec8 Adding migration 2013-09-18 11:53:32 +02:00
Daniel Greenfeld
5fa2f53e13 More explicit installation instructions 2013-09-16 13:00:22 +02:00
Daniel Greenfeld
a7feb05ca4 bump to 0.6.0rc1 2013-09-12 16:44:33 +02:00
Daniel Greenfeld
cfce0f4afb Add @yarbelk to authors and update the history file 2013-09-11 22:13:00 +02:00
Daniel Greenfeld
2b044712b6 Merge pull request #372 from yarbelk/fix_multipart
Fix missing enctype="multipart/form-data" when needed
2013-09-11 12:47:46 -07:00
yarbelk
690401d604 Fix missing enctype="multipart/form-data" when needed
- add app example.files with tests, based on example2.
- add check in base update template which checks if
  form.is_multitype and adds the encoding for it
- update gitignore to ignore the uploaded media folder
- add test to blog to ensure that the create form is not
  multipart encoded
2013-09-11 22:20:38 +08:00
Daniel Greenfeld
eb768817f3 Merge pull request #370 from douglasmiranda/fix-typeerror
fix TypeError - the right way
2013-08-26 23:42:52 -07:00
Douglas Miranda
087a918542 fix TypeError - the right way () 2013-08-26 20:20:09 -04:00
Daniel Greenfeld
33b83ead5f Merge pull request #366 from douglasmiranda/implementing-app-verbose-name
Implementing "app verbose name"
2013-08-13 16:51:09 -07:00
Daniel Greenfeld
b492f0a166 Merge pull request #364 from powersurge360/all-model-action
All model action
2013-08-13 16:50:33 -07:00
Douglas Miranda
cfba14384e Tests for the "app verbose name". 2013-08-05 03:39:17 -04:00
Douglas Miranda
7806053516 Using on the blog app the new "app verbose name feature". 2013-08-05 03:37:51 -04:00
Douglas Miranda
08f38c26c2 Showing the app verbose names on the templates. 2013-08-05 03:36:37 -04:00
Douglas Miranda
7f830c8aeb Registering and making the app verbose names accessible into the views. 2013-08-05 03:35:03 -04:00
Kevin Diale
bf21d8dac4 Adding tests for unselected actions. 2013-08-02 15:13:07 -04:00
Kevin Diale
35cb0bcc75 "only_selected" flag exists to specify whether it should affect the
whole queryset or just those that are selected.
2013-08-02 13:58:57 -04:00
Daniel Greenfeld
fa86f85afc Remove accidental dependency on django.contrib.admin 2013-08-02 12:52:38 +02:00
Daniel Greenfeld
3ddaaefba4 Merge pull request #362 from powersurge360/modeladmin-ordering
Modeladmin ordering
2013-08-02 03:39:10 -07:00
Kevin Diale
9e29500f5c Pretty simple tests for this one. 2013-08-01 18:16:59 -04:00
Kevin Diale
1aa4ee36d6 Implemented ordering, tests in the next commit. 2013-08-01 12:00:03 -04:00
Daniel Greenfeld
361aeda9da Fix the theme rules page 2013-08-01 12:54:17 +02:00
Daniel Greenfeld
f0f9074ca2 Describe theming better 2013-08-01 12:46:38 +02:00
Daniel Greenfeld
7c3bc1e0b0 merge 2013-08-01 12:39:21 +02:00
Daniel Greenfeld
68cc955fce Merge branch 'admin-date-hierarchy' of git://github.com/powersurge360/django-admin2 into powersurge360-admin-date-hierarchy 2013-08-01 12:31:38 +02:00
Daniel Greenfeld
3b0526b335 Merge branch 'develop' of github.com:pydanny/django-admin2 into develop 2013-08-01 12:28:39 +02:00
Kevin Diale
03261fa461 Should be ready to go! 2013-07-31 17:43:05 -04:00
Kevin Diale
bb127c9483 Added unit tests. 2013-07-31 17:31:23 -04:00
Kevin Diale
bab18c97c1 Interface is most of the way there. 2013-07-31 14:58:08 -04:00
Kevin Diale
966e549ace Basic interface done. 2013-07-31 12:57:48 -04:00
the5fire
6f531ea09f Test for the ModelAdmin2 get_index_kwargs 2013-07-31 07:17:07 +08:00
Kevin Diale
8dc0821539 Left in a wee bit of debugging code. 2013-07-30 17:20:27 -04:00
Kevin Diale
29eaa661d5 Drilling down works on a functional level. Gotta set up interface and
tests.

On a related note, TAKE THAT DJANGO FILTERS.
2013-07-30 16:28:24 -04:00
Daniel Greenfeld
555b022fb2 Adding Kevin Diale to authors. 2013-07-30 17:05:41 +02:00
Daniel Greenfeld
b44fe10e22 Update AUTHORS.rst 2013-07-30 17:04:37 +02:00
Daniel Greenfeld
466ae1d5b7 Merge pull request #358 from powersurge360/actions-selection-counter
Actions selection counter
2013-07-30 08:04:05 -07:00
Kevin Diale
eb204104bd Added some tests. 2013-07-30 10:05:57 -04:00
Kevin Diale
6ff47746df Added in actions_selection_counter, will add tests/polish next commit. 2013-07-29 14:48:05 -04:00
the5fire
e8c5e9ec52 add admin model list pagination template 2013-07-28 11:19:05 +08:00
the5fire
ee0c1b0031 fix list_per_page can't enable in model list view 2013-07-28 10:26:08 +08:00
Andrews Medina
b7b0d9ba8c added docs about AdminView. 2013-07-27 01:59:48 -03:00
Andrews Medina
3c7fc0fc0e Merge branch 'develop' into admin_view
Conflicts:
	djadmin2/types.py
2013-07-26 17:55:55 -03:00
Andrews Medina
26ba68115f Using six to set the ModelAdminBase2 metaclass. 2013-07-26 17:41:58 -03:00
Daniel Greenfeld
1b7b803b1b Update README.rst 2013-07-25 22:36:02 +02:00
Daniel Greenfeld
0210ea8f07 Adding Kenneth Love to authors. 2013-07-22 00:44:15 +02:00
Daniel Greenfeld
45b7aea7f6 Merge pull request #351 from douglasmiranda/fix-issue-348
fix: issue #348
2013-07-21 15:42:50 -07:00
Daniel Greenfeld
5f76d84e72 Merge pull request #349 from brack3t/feature/history
Feature/history - Merging anyway. I'll pull out the auth link tomorrow.
2013-07-21 15:42:30 -07:00
Douglas Miranda
ac0f5da4f6 fix: issue #348
Adding djadmin2.themes.djadmin2theme_default on INSTALLED_APPS.
2013-07-21 17:31:11 -04:00
Daniel Greenfeld
be1080c43d Work on contributing and the FAQ 2013-07-21 13:26:03 +02:00
Chris Jones
4959a095c4 fix merge error. 2013-07-18 17:44:19 -07:00
Kenneth Love
3844a952c0 merge 2013-07-18 17:41:33 -07:00
Kenneth Love
738e3a9dd8 template changes 2013-07-18 17:40:54 -07:00
Chris Jones
e7f8170237 Ooooooooo pretty. 2013-07-18 17:33:19 -07:00
Kenneth Love
af11cb012e Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 17:31:11 -07:00
Kenneth Love
e5f1940f3e action_type property 2013-07-18 17:31:08 -07:00
Chris Jones
57ef2a428c Nicer to look at. 2013-07-18 17:30:41 -07:00
Chris Jones
69f2a357f8 Why don't you PEP your 8! Add in change messages. 2013-07-18 17:23:48 -07:00
Kenneth Love
52c337a72c force_text for object_repr and condition on history link 2013-07-18 17:16:07 -07:00
Kenneth Love
acae0a2620 icons 2013-07-18 17:02:40 -07:00
Kenneth Love
99ae00a0ae show user that performed action 2013-07-18 16:56:08 -07:00
Kenneth Love
802265b60f Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:54:26 -07:00
Kenneth Love
ee2ca9feff template updates 2013-07-18 16:54:22 -07:00
Chris Jones
ee1c90cd9f Working model history view. 2013-07-18 16:51:16 -07:00
Kenneth Love
a7951353a8 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:38:20 -07:00
Kenneth Love
7dbf50426f model_history template 2013-07-18 16:38:13 -07:00
Chris Jones
d62b612583 nevermind. 2013-07-18 16:38:00 -07:00
Chris Jones
f7ef575709 Should be a detail view. 2013-07-18 16:37:18 -07:00
Chris Jones
82d9e7ae65 PEP8 love. 2013-07-18 16:36:31 -07:00
Chris Jones
4089ad4aab PEP8 all the things. Add in new history url. 2013-07-18 16:30:40 -07:00
Chris Jones
555588f13c PEP8 2013-07-18 16:08:38 -07:00
Chris Jones
ae39a26e13 Use model properties for action ints. 2013-07-18 15:58:31 -07:00
Kenneth Love
598b0a704f basics for recording history 2013-07-18 13:59:08 -07:00
Chris Jones
14d2a20431 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:46:17 -07:00
Chris Jones
6273e68dde Stealing the logger from the old admin. 2013-07-18 13:46:00 -07:00
Kenneth Love
76ab676530 more html 2013-07-18 13:40:50 -07:00
Kenneth Love
ef77c8242d Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:06:04 -07:00
Kenneth Love
4cfe10e645 actual data in history template 2013-07-18 13:05:56 -07:00
Chris Jones
fb0e73a37e PEP8 2013-07-18 13:04:47 -07:00
Kenneth Love
5ed5123836 started on history 2013-07-18 13:00:14 -07:00
Daniel Greenfeld
9e4d2ec039 Move default theme to it's own app. This way we are following the same pattern that other themes will have to use fix #333 2013-07-18 17:55:08 +02:00
Daniel Greenfeld
82e56bdae5 prep for #273 2013-07-18 16:32:50 +02:00
Daniel Greenfeld
f1f9f6e83e update the contributing instructions to match what's current 2013-07-18 16:17:20 +02:00
Ludvig Wadenstein
3cc592a906 Inlines separated into stacked and tabular 2013-07-18 15:02:07 +02:00
Daniel Greenfeld
2004df71bb Pointing coveralls at the develop branch 2013-07-16 23:52:09 +02:00
Daniel Greenfeld
0f7c880907 Merge pull request #338 from z4r/patch-1
Excluding tests from coverage
2013-07-16 14:51:17 -07:00
Andrea de Marco
7090d00265 Excluding tests from coverage 2013-07-16 23:45:15 +02:00
Daniel Greenfeld
ab8770fb16 Add coveralls badge to README. Touches #325, #285 and powered by #337 2013-07-16 22:09:25 +02:00
Daniel Greenfeld
62ec7771d2 Update AUTHORS.rst 2013-07-16 21:56:42 +02:00
Daniel Greenfeld
cded4c4027 Merge pull request #337 from z4r/develop
It should fix #285 and #325
2013-07-16 12:55:46 -07:00
z4r
a9a9d4574e It should fix #285 2013-07-16 20:50:44 +02:00
z4r
da632d2841 It should fix #325 2013-07-16 20:36:03 +02:00
Daniel Greenfeld
29425ea5e4 per #240, this adds indexing to the design document 2013-07-16 20:32:46 +02:00
Daniel Greenfeld
d1a4b849ab per #240, this adds indexing to the contributing document 2013-07-16 20:28:58 +02:00
Daniel Greenfeld
9957e782c3 This should help with migration efforts and related documentation like #284 2013-07-16 20:13:11 +02:00
Daniel Greenfeld
82934d4445 Merge pull request #335 from ludw/savebuttons
Removed some duplication of savebutton markup in templates
2013-07-16 10:36:26 -07:00
Daniel Greenfeld
58b0eb5df7 Contributing tweak 2013-07-16 09:18:38 +02:00
Ludvig Wadenstein
116ae29dab Removed some duplication of savebutton markup in templates 2013-07-15 22:47:10 +02:00
Daniel Greenfeld
854832accd Fix setup.py issue 2013-07-14 15:29:20 +02:00
Daniel Greenfeld
944baf62db Cleanup of example templates 2013-07-14 12:36:56 +02:00
Daniel Greenfeld
ff8a0a5c27 remove broken, stupid coveralls 2013-07-14 11:56:38 +02:00
Daniel Greenfeld
b0a18a13a1 finish of final README update 2013-07-14 11:54:57 +02:00
Daniel Greenfeld
54c4bcf933 prep for release of 0.5.1. 2013-07-14 11:50:13 +02:00
Daniel Greenfeld
e8c68f5c0c removing SCREENSHOTS include because Github doesn't do RST includes 2013-07-14 11:23:44 +02:00
Daniel Greenfeld
8853a0423d README cleanup 2013-07-14 11:21:30 +02:00
Daniel Greenfeld
d2741ced7b fix 320 2013-07-14 11:05:22 +02:00
Daniel Greenfeld
99b9285f80 Merge branch 'better_examples2' of git://github.com/bootandy/django-admin2 into bootandy-better_examples2 2013-07-14 10:55:47 +02:00
Daniel Greenfeld
d528ccc095 fix #332 which removes absolute versions from requirements 2013-07-14 10:11:53 +02:00
Daniel Greenfeld
aeaa45e31a Theme bump 2013-07-13 12:37:44 +02:00
Daniel Greenfeld
0ac9181197 Theme work 2013-07-13 12:34:47 +02:00
Daniel Greenfeld
ca8f057b5e FAQ bump 2013-07-13 11:53:17 +02:00
Daniel Greenfeld
e8b9dcb109 FAQ bump 2013-07-13 11:53:04 +02:00
Daniel Greenfeld
f8b5372adf FAQ bump 2013-07-13 11:10:00 +02:00
Daniel Greenfeld
3e9c7f13ec FAQ bump 2013-07-13 11:06:01 +02:00
Daniel Greenfeld
3daa553898 Adding FAQ 2013-07-13 11:04:24 +02:00
d1ffuz0r
ae0ab23b12 unused attribute was removed 2013-07-10 10:59:39 +07:00
bootandy
5477b7ad36 fix tests. now require different params on post 2013-07-09 19:36:13 +01:00
bootandy
a287898c59 merge 2013-07-09 17:58:52 +02:00
Daniel Greenfeld
c545912561 Merge pull request #322 from douglasmiranda/fix-fixed-height
fixing the fixed height of .change_form
2013-07-09 05:55:56 -07:00
Daniel Greenfeld
31941ca309 Final prep for 0.5.0 release 2013-07-09 14:18:23 +02:00
Daniel Greenfeld
fc4f6a5741 Update README.rst 2013-07-09 14:13:16 +02:00
Daniel Greenfeld
c0f8839faf Merge pull request #324 from dbrgn/i18n-automation
i18n automation / updated and compiled all files from Transifex
2013-07-09 05:09:10 -07:00
Danilo Bargen
dba0b1b51c PEP8 2013-07-09 13:52:07 +02:00
Danilo Bargen
fd98d91614 Replaced shell script with fabfile 2013-07-09 13:51:24 +02:00
Danilo Bargen
bed88973d7 Compiled all messages. Ready for release. Fixes #314, refs #317 2013-07-09 12:22:36 +02:00
Danilo Bargen
783401415d Added updated translation files from transifex 2013-07-09 12:21:07 +02:00
Danilo Bargen
daa2623430 Push translations too when using pushtx 2013-07-09 12:20:56 +02:00
Danilo Bargen
4f70167f49 Added checkmessages command to i18n.sh 2013-07-09 12:08:26 +02:00
Danilo Bargen
d5a33da0a3 Added pulltx / pushtx to i18n.sh 2013-07-09 11:57:09 +02:00
Daniel Greenfeld
15c90a3388 Update AUTHORS.rst 2013-07-09 11:53:16 +02:00
Daniel Greenfeld
4b4b693ecb Merge pull request #323 from marekzelinka/develop
Fixed typo in themes docs
2013-07-09 02:52:31 -07:00
Danilo Bargen
4506613482 Fixed bug in .tx/config 2013-07-09 11:43:44 +02:00
Marek Zelinka
da4c86fd87 Fixed typo themes docs 2013-07-09 11:43:35 +02:00
Danilo Bargen
15f2d6a89e Remove .mo from .gitignore 2013-07-09 11:42:22 +02:00
Danilo Bargen
aeb8a84726 Pulled new translations 2013-07-09 11:34:40 +02:00
Danilo Bargen
bb33879e3b Added transifex-client configfile 2013-07-09 11:27:14 +02:00
Danilo Bargen
60f26b7748 Added i18n.sh script (refs #314) 2013-07-09 11:15:47 +02:00
Douglas Miranda
90342afba2 fixing the fixed height of .change_form in order to provide an "auto height" 2013-07-09 03:04:28 -04:00
d1ffuz0r
8def10b2da Fixed #292 added missing default columns and filters 2013-07-09 13:10:48 +07:00
Daniel Greenfeld
9b7560e720 Merge pull request #319 from dasm/develop
Updated AUTHORS
2013-07-08 11:26:39 -07:00
Dariusz Smigiel
df8334dfa4 Updated AUTHORS 2013-07-08 20:22:23 +02:00
Daniel Greenfeld
c6e077250e update release to 0.5.0 for #317 2013-07-08 19:28:04 +02:00
Daniel Greenfeld
da6ff9f3ce Tweaks to make #308 work 2013-07-08 19:14:19 +02:00
Daniel Greenfeld
a909ab1517 Merge of #308 2013-07-08 19:08:18 +02:00
Daniel Greenfeld
91117a8e58 Updated readme 2013-07-08 19:02:36 +02:00
Daniel Greenfeld
2ec6441de3 Merge pull request #309 from dbrgn/actions_on_top_bottom
Implemented actions_on_top and actions_on_bottom
2013-07-08 09:58:12 -07:00
Daniel Greenfeld
f2d1fbd24f Merge pull request #315 from dbrgn/iss314
Compiled messages for German and Slovak
2013-07-08 09:57:32 -07:00
Danilo Bargen
f178f2fccd Compiled messages for German and Slovak 2013-07-08 16:16:02 +02:00
Daniel Greenfeld
e68794def7 Merge pull request #313 from dbrgn/i18n-de-sk
Translations for German and Slovak
2013-07-08 04:33:54 -07:00
Danilo Bargen
8ef601e84d Fixed order of locale middleware 2013-07-08 11:02:47 +02:00
Danilo Bargen
5d736580a9 Updated AUTHORS 2013-07-08 10:58:07 +02:00
Danilo Bargen
ec0300fa32 Added translated locales for Slovak 2013-07-08 10:57:39 +02:00
Danilo Bargen
18fda874b0 Added translated locales for German 2013-07-08 10:54:32 +02:00
Danilo Bargen
84d8d424d0 Fixed tests 2013-07-07 23:06:57 +02:00
Eleonore9
3ca4fa394f for #308 this styles the save_on_top 2013-07-07 18:19:33 +02:00
Daniel Greenfeld
58dac69ee7 Merge pull request #310 from bootandy/ordering2
allow ordering by field by click in admin
2013-07-07 07:59:53 -07:00
Daniel Greenfeld
0b2efdb5f8 Fix the README 2013-07-07 16:53:07 +02:00
bootandy
06c2e81392 allow sort by field 2013-07-07 16:48:21 +02:00
Danilo Bargen
4977f269b5 Implemented actions_on_top and actions_on_bottom (fixes #267, #268) 2013-07-07 16:46:59 +02:00
Daniel Greenfeld
153137d4eb Fixed the installation documentation 2013-07-07 16:45:12 +02:00
Daniel Greenfeld
fff84a6bfe Update README.rst 2013-07-07 16:23:50 +02:00
Daniel Greenfeld
47df410c07 merge 2013-07-07 16:13:48 +02:00
Daniel Greenfeld
e2f6bb859e Add page_title link 2013-07-07 15:50:55 +02:00
Daniel Greenfeld
0052cd3a9a Change the save_on_bottom on the top of the update form to be save_on_top 2013-07-07 15:45:27 +02:00
Daniel Greenfeld
96cde5cc94 example admin2 file cleanup 2013-07-07 15:43:43 +02:00
Daniel Greenfeld
61ae3ec149 Repair the things that I just broke 2013-07-07 15:42:54 +02:00
Daniel Greenfeld
7b8b9afa96 merge 2013-07-07 15:39:59 +02:00
Daniel Greenfeld
152059528a Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-07 15:29:13 +02:00
Daniel Greenfeld
db63852846 Adding the latest 2013-07-07 15:24:57 +02:00
Daniel Greenfeld
d6d1fabf24 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-07 15:23:58 +02:00
Daniel Greenfeld
ec1c1f669a Release notes 2013-07-07 15:23:39 +02:00
Daniel Greenfeld
89e6cd8db0 Merge pull request #299 from dbrgn/iss287
Implemented custom value renderers
2013-07-07 06:21:14 -07:00
Daniel Greenfeld
c2b122fdac Merge pull request #301 from dbrgn/translators
Added translators to AUTHORS
2013-07-07 06:13:22 -07:00
Danilo Bargen
043787ea45 Fixed bug caused by rebase 2013-07-07 15:10:57 +02:00
Danilo Bargen
b2f4290bf2 Documentation 2013-07-07 15:08:42 +02:00
Danilo Bargen
6e42b9459d Blog example app tests 2013-07-07 15:08:41 +02:00
Danilo Bargen
2a8bab0170 Added renderer tests 2013-07-07 15:08:41 +02:00
Danilo Bargen
1b7382526f Automatically choose best renderer by default 2013-07-07 15:08:07 +02:00
Danilo Bargen
835992b8d0 Added number renderer 2013-07-07 15:08:07 +02:00
Danilo Bargen
5cd153736d Moved get_attr filter to utils 2013-07-07 15:08:07 +02:00
Danilo Bargen
78b063a586 Added sample configuration to example app 2013-07-07 15:08:07 +02:00
Danilo Bargen
121f5b8564 First renderer implementation 2013-07-07 15:07:06 +02:00
Danilo Bargen
2f22eecc1b Converted get_attr tag to filter 2013-07-07 15:07:06 +02:00
Danilo Bargen
77d4e00158 Added translators to AUTHORS 2013-07-07 15:05:42 +02:00
Daniel Greenfeld
506f58f705 This is DJANGO-ADMIN! fix #300 2013-07-07 14:19:23 +02:00
Daniel Greenfeld
35b1125429 fix #293 2013-07-07 12:10:50 +02:00
Daniel Greenfeld
a9c2d1d198 improved filter form styling 2013-07-07 11:59:45 +02:00
Daniel Greenfeld
4d5b170e10 merge 2013-07-07 11:48:56 +02:00
bootandy
e57f821ce1 fix string filters 2013-07-07 11:34:06 +02:00
Daniel Greenfeld
3dcb24e8e4 Merge pull request #294 from NotSqrt/i18n
I18n : improved internationalization 😁
2013-07-07 02:28:33 -07:00
NotSqrt
322a7793ed add locale source files for English 2013-07-07 11:14:13 +02:00
NotSqrt
40052d671d regenerate locales after change on buttons 2013-07-07 11:02:54 +02:00
NotSqrt
c132a7cdd0 more details on i18n 2013-07-07 11:00:49 +02:00
NotSqrt
8935395534 work on i18n : add comments for translators, french translation to check the result 2013-07-07 11:00:49 +02:00
Daniel Greenfeld
876cc2c723 for #268, this adds actions_on_bottom for the default view 2013-07-07 10:58:35 +02:00
Daniel Greenfeld
e66175ed21 Remove django-admin2 from the dashboard if it's not been activated 2013-07-07 10:42:55 +02:00
Daniel Greenfeld
ed23fbf09e adding coveralls install for #285 2013-07-07 10:11:19 +02:00
Daniel Greenfeld
ba2eb5b22d Update README.rst 2013-07-07 08:44:59 +02:00
Daniel Greenfeld
d4ca6ec59a Update AUTHORS.rst 2013-07-06 18:32:36 +02:00
Daniel Greenfeld
038313c81c merge 2013-07-06 18:33:44 +02:00
Daniel Greenfeld
4908a9675e Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 18:30:19 +02:00
Daniel Greenfeld
c007924df0 PEP-8 of filters 2013-07-06 18:28:05 +02:00
Daniel Greenfeld
9a8a836141 PEP-8 of filters 2013-07-06 18:26:29 +02:00
Daniel Greenfeld
12d19fc0ee Merge pull request #278 from ifosch/utils-tests-improvements
djadmin2.utils.model_options tested to adapt to model._meta changes
2013-07-06 09:26:00 -07:00
Daniel Greenfeld
1337c5fd49 Merge pull request #265 from dbrgn/translation-docs
Better translation docs
2013-07-06 09:25:29 -07:00
Daniel Greenfeld
b26766deeb Add Michal Kuffa to authors. 2013-07-06 18:24:10 +02:00
Daniel Greenfeld
115c7f9a09 Merge branch 'list_filter' of git://github.com/beezz/django-admin2 into beezz-list_filter 2013-07-06 17:59:21 +02:00
Michal Kuffa
261322e9a6 Added django-filters to requirements 2013-07-06 17:45:47 +02:00
Michal Kuffa
075f887837 Added basic test for list_filter feature 2013-07-06 17:39:36 +02:00
Michal Kuffa
229db4ff86 minor bugfix 2013-07-06 17:38:49 +02:00
Daniel Greenfeld
ac2ce6e647 fix indentation issues 2013-07-06 17:35:58 +02:00
Daniel Greenfeld
5b33fcde51 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 17:34:54 +02:00
Ignasi Fosch
07789f566f djadmin2.utils.model_options tested to adapt to model._meta changes 2013-07-06 17:34:01 +02:00
Daniel Greenfeld
16842e8e33 Merge pull request #275 from Eleonore9/for-pull-requests
code style changes
2013-07-06 08:14:43 -07:00
Eleonore9
2a462e6846 code style changes 2013-07-06 17:08:03 +02:00
Michal Kuffa
aefd7d8df0 Added simple test for presence of list_filter container 2013-07-06 16:48:42 +02:00
Michal Kuffa
04bb629a42 Removed unused imports 2013-07-06 16:47:52 +02:00
Michal Kuffa
0862210d4d Added id to list_filters container 2013-07-06 16:47:11 +02:00
Daniel Greenfeld
596af4a085 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 16:40:10 +02:00
Daniel Greenfeld
847d0ee78f Add an action_name context variable to model form views 2013-07-06 16:39:42 +02:00
Danilo Bargen
8ec6157215 Reference to gettext docs 2013-07-06 16:38:24 +02:00
Danilo Bargen
7f4b799b1b Added RTD link to README 2013-07-06 16:33:59 +02:00
Michal Kuffa
6bd314631b add docs to our custom widgets and default mapping, just to not formatting 2013-07-06 16:27:55 +02:00
Daniel Greenfeld
8c399fadf8 merge in stuff 2013-07-06 16:27:08 +02:00
Daniel Greenfeld
a1a94676a4 Update AUTHORS.rst 2013-07-06 16:26:45 +02:00
Daniel Greenfeld
2dcc816e29 Merge branch 'for-pull-requests' of git://github.com/Eleonore9/django-admin2 into Eleonore9-for-pull-requests 2013-07-06 16:22:23 +02:00
Michal Kuffa
d433013fcc Merge remote-tracking branch 'upstream/develop' into list_filter
Conflicts:
	djadmin2/views.py
2013-07-06 16:22:14 +02:00
Danilo Bargen
c5737331f0 Better translation docs 2013-07-06 16:21:44 +02:00
Daniel Greenfeld
3435331d60 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 16:21:10 +02:00
Daniel Greenfeld
03acbe0486 Merge branch 'template_rename2' of git://github.com/bootandy/django-admin2 into bootandy-template_rename2 2013-07-06 16:19:12 +02:00
Michal Kuffa
473ea98f98 Added list_filter attribute to contrib's admin, admin2 definition of Post, Comment model admin. 2013-07-06 16:09:03 +02:00
Michal Kuffa
4522e65ce6 Added list_filter block 2013-07-06 16:07:43 +02:00
Michal Kuffa
21e18f9adc Added djadmin2.filters module.
This module is handling list filter creation by inspecting the model of
supplied queryset. Contains default mapping for field type filters to
our custom form widgets that are rendering links instead of inputs.
2013-07-06 15:59:55 +02:00
bootandy
a8cf4554ad more example template admin2 reference to djadmin2 2013-07-06 15:56:46 +02:00
Daniel Greenfeld
b94143ca9d Merge pull request #262 from NotSqrt/i18n-doc
doc on internationalization 😳
2013-07-06 06:52:52 -07:00
Eleonore9
5b4dba559a Tests for example2/models.py 2013-07-06 15:48:42 +02:00
Michal Kuffa
d41a70143e build_list_filter method added to ModelListView. This method take care of ModelAdmin2.Meta.list_filter option 2013-07-06 15:47:09 +02:00
NotSqrt
61ce055e70 doc on internationalization 2013-07-06 15:43:56 +02:00
Daniel Greenfeld
819f8cd677 merge 2013-07-06 15:42:25 +02:00
Daniel Greenfeld
c141efbb45 Merge pull request #259 from dbrgn/translators
Added translators to AUTHORS 🔨
2013-07-06 06:40:40 -07:00
Danilo Bargen
09201f8fba Added translators to AUTHORS 2013-07-06 15:39:27 +02:00
Daniel Greenfeld
e7d4ef4fbc Merge pull request #258 from dbrgn/i18n
Translation Stuff
2013-07-06 06:34:11 -07:00
Danilo Bargen
673a3027dd Added Italian translation file 2013-07-06 15:27:19 +02:00
bootandy
9f449a6b66 moving templates to djadmin 2013-07-06 15:23:08 +02:00
Daniel Greenfeld
6af02f4489 Update AUTHORS.rst 2013-07-06 15:20:49 +02:00
Danilo Bargen
ee4dfb4ac6 Added Català translation 2013-07-06 15:19:22 +02:00
bootandy
1ef08cc20f first itteration 2013-07-06 15:18:01 +02:00
Daniel Greenfeld
4288b2568d Adding Andy Boot to authors
POW! 😉
2013-07-06 15:06:18 +02:00
Daniel Greenfeld
483386635d Slight tweak to the built-in-views 2013-07-06 15:06:27 +02:00
Daniel Greenfeld
f128b23643 Merge branch 'docs' of git://github.com/bootandy/django-admin2 into bootandy-docs 2013-07-06 15:02:35 +02:00
Danilo Bargen
3c44a8b930 Changed inconsistent use of "login/logout" 2013-07-06 15:02:33 +02:00
Daniel Greenfeld
32bcce562e Merge pull request #254 from ifosch/test-improvements
Actions test isolated
2013-07-06 05:56:50 -07:00
Danilo Bargen
2842699b71 Added German and Spanish translation files 2013-07-06 14:54:21 +02:00
Danilo Bargen
a6d407b887 Fixes in language files 2013-07-06 14:46:15 +02:00
bootandy
679a997f80 update docs - context variables 2013-07-06 14:40:49 +02:00
Ignasi Fosch
260cabcddf Actions tests included in runtest.py execution 2013-07-06 14:22:38 +02:00
Ignasi Fosch
550c6b684b Moving action tests to another file 2013-07-06 14:17:54 +02:00
Daniel Greenfeld
f61c6648ea Merge pull request #253 from dbrgn/rtd
Read the docs
2013-07-06 05:09:16 -07:00
Daniel Greenfeld
882da13585 Adding Henri Colas to the authors file 2013-07-06 14:07:30 +02:00
Danilo Bargen
a6276c6141 Fixed intersphinx objects reference for Django 2013-07-06 13:59:16 +02:00
Danilo Bargen
2282f9681d Get rid of all Sphinx warnings 2013-07-06 13:54:48 +02:00
Danilo Bargen
771af88877 Make django docs intersphinx work 2013-07-06 13:50:21 +02:00
NotSqrt
5889c5d849 i18n : fixes for tests -> use string interpolation, not positional interpolation 2013-07-06 13:33:52 +02:00
NotSqrt
187773979b add default english translation, add french translation 2013-07-06 13:33:52 +02:00
NotSqrt
5de843313b make the examples use i18n 2013-07-06 13:33:52 +02:00
NotSqrt
5ab4f33b6a check i18n completeness 2013-07-06 13:33:52 +02:00
Danilo Bargen
3feabdf938 Typo: :docs: should be :doc 2013-07-06 12:23:36 +02:00
Daniel Greenfeld
74573faf7a Update README.rst 2013-07-06 12:18:58 +02:00
Daniel Greenfeld
ecb5ea2bf9 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 12:21:21 +02:00
Daniel Greenfeld
7db738d469 friendlier way of handling django_extensions 2013-07-06 12:21:02 +02:00
Daniel Greenfeld
0f3cfed915 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 12:09:28 +02:00
Daniel Greenfeld
d407d804b0 Add coverage badge per #222 2013-07-06 12:09:13 +02:00
Daniel Greenfeld
dab5e36c10 Merge branch 'dbrgn-iss236' into develop 2013-07-06 12:09:13 +02:00
Daniel Greenfeld
cf77eb0ec5 Merge branch 'iss236' of git://github.com/dbrgn/django-admin2 into develop 2013-07-06 12:07:54 +02:00
Daniel Greenfeld
aa6d246fac Merge pull request #249 from dbrgn/coverage
Coverage
2013-07-06 03:07:21 -07:00
Danilo Bargen
8217789e11 Prepared travis.yml for coveralls 2013-07-06 11:57:57 +02:00
Danilo Bargen
142f33f2f6 Added .coveragerc 2013-07-06 11:56:29 +02:00
Daniel Greenfeld
fd6eec2a54 Adding Ignasi Fosch Alonso to Authors 2013-07-06 11:56:18 +02:00
Danilo Bargen
ce5566be82 Show verbose column name in list view (fixes #236) 2013-07-06 11:53:46 +02:00
Daniel Greenfeld
653dac411d Merge branch 'iss236' of git://github.com/dbrgn/django-admin2 into dbrgn-iss236 2013-07-06 11:52:48 +02:00
Daniel Greenfeld
4205660251 Merge pull request #246 from ifosch/test-improvements
djadmin2.actions.get_description test implemented
2013-07-06 02:43:54 -07:00
Daniel Greenfeld
fa94f81e7f Merge 2013-07-06 11:36:42 +02:00
Danilo Bargen
3e31974b39 Added model_attr_verbose_name template filter.
Renamed the model_field_verbose_name to model_attr_verbose_name in
order to handle both fields and methods.
2013-07-06 11:32:57 +02:00
Danilo Bargen
973996cfe0 Show verbose column name in list view (fixes #236) 2013-07-06 11:32:57 +02:00
Danilo Bargen
6331b94a81 Added model_method_verbose_name util function 2013-07-06 11:32:57 +02:00
Danilo Bargen
56b26fb190 Added new template filter: model_field_verbose_name 2013-07-06 11:32:57 +02:00
Daniel Greenfeld
3796d312e3 Add index links for permissions 2013-07-06 11:18:38 +02:00
Ignasi Fosch
7c6f6a7b4a djadmins.actions lines cut out to 80 characters long 2013-07-06 11:17:12 +02:00
Ignasi Fosch
793cec7828 djadmins.actions lines cut out to 80 characters long 2013-07-06 11:16:13 +02:00
Daniel Greenfeld
745f2750fa Add django-debug-toolbar to example2 2013-07-06 11:15:41 +02:00
Audrey Roy
1a860031ee Better example project home. Close #241. 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
80aa636e82 Indexing actions 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
7e96b27c5f Index test 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
7e0a676ad9 fix #234, this adds formal install instructions to the docs and includes reorganization of the docs 2013-07-06 11:15:40 +02:00
Audrey Roy
f65d7e3722 Simpler way to pull upstream changes, with optional rebase for advanced git users. 2013-07-06 11:15:40 +02:00
Daniel Greenfeld
9fad9ff9d1 Add Danilo Bargen to authors 2013-07-06 11:15:40 +02:00
Danilo Bargen
4f904e73fd PEP8 2013-07-06 11:15:40 +02:00
Daniel Greenfeld
19e2bac445 Update AUTHORS.rst 2013-07-06 11:14:34 +02:00
Daniel Greenfeld
0fe07d4002 Merge branch 'better-example' of git://github.com/audreyr/django-admin2 into audreyr-better-example 2013-07-06 11:08:46 +02:00
Daniel Greenfeld
6589fef693 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 11:08:23 +02:00
Daniel Greenfeld
9e8efcd218 Add django-debug-toolbar to example2 2013-07-06 11:08:11 +02:00
Ignasi Fosch
1bea34ac1a djadmin2.actions.get_description test implemented 2013-07-06 11:00:03 +02:00
Audrey Roy
807b3776fb Better example project home. Close #241. 2013-07-06 10:57:00 +02:00
Audrey Roy
a5d03899a9 Merge pull request #239 from audreyr/fix-contributor-instructions
Simpler way to pull upstream changes, with optional rebase for advanced ...
2013-07-06 01:04:36 -07:00
Daniel Greenfeld
9492c8372a Indexing actions 2013-07-06 10:03:54 +02:00
Daniel Greenfeld
0de830abf9 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 09:59:01 +02:00
Daniel Greenfeld
2ef846a8fa Index test 2013-07-06 09:58:47 +02:00
Daniel Greenfeld
1d254c8cae Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 09:55:35 +02:00
Daniel Greenfeld
12579fdd0e fix #234, this adds formal install instructions to the docs and includes reorganization of the docs 2013-07-06 09:55:29 +02:00
Audrey Roy
c4120fa22a Simpler way to pull upstream changes, with optional rebase for advanced git users. 2013-07-06 09:55:06 +02:00
Daniel Greenfeld
da4cf6deb9 Add Danilo Bargen to authors 2013-07-06 09:53:24 +02:00
Daniel Greenfeld
a826c5e186 Merge pull request #238 from dbrgn/pep8
PEP8
2013-07-06 00:51:11 -07:00
Danilo Bargen
39aaacccb6 PEP8 2013-07-06 09:37:25 +02:00
Daniel Greenfeld
4aec1a3836 Update AUTHORS.rst 2013-07-06 08:13:51 +02:00
Daniel Greenfeld
033e0124cf Merge pull request #233 from chrisjones-brack3t/develop
Quick and dirty install/setup docs.
2013-07-05 22:59:27 -07:00
Chris Jones
433fb51b6a Add one more thing for rest framework 2013-07-05 17:06:07 -07:00
Chris Jones
1d037f27a2 Quick and dirty install/setup docs. 2013-07-05 13:59:46 -07:00
Daniel Greenfeld
ca93b5ea97 Update README.rst 2013-07-05 16:53:41 +02:00
Daniel Greenfeld
26a63473be Update README.rst 2013-07-05 16:53:04 +02:00
Daniel Greenfeld
1b798b66bb Update README.rst 2013-07-05 16:48:46 +02:00
Daniel Greenfeld
6de616daa5 Update README.rst 2013-07-05 16:48:35 +02:00
Daniel Greenfeld
136cac7cf7 comment 2013-07-05 12:06:09 +02:00
Daniel Greenfeld
b580ba7f41 work on prep for #220 2013-07-04 14:07:32 +02:00
Daniel Greenfeld
9d54ed1650 clean up TODO 2013-07-04 12:37:28 +02:00
Daniel Greenfeld
f469e8f25e Getting the built-in-views to load in autodoc 2013-07-04 12:35:39 +02:00
Daniel Greenfeld
24f67b9c07 improved line commands 2013-07-02 10:32:15 +02:00
Daniel Greenfeld
5037d0e2c9 Changing fancy to dandy 2013-07-02 10:26:21 +02:00
Daniel Greenfeld
e819e7df02 More for #20 2013-07-02 10:08:46 +02:00
Daniel Greenfeld
5cfae7a0bc TOC fixes 2013-07-02 10:06:29 +02:00
Daniel Greenfeld
2c2214415f Change static path for #220 per @jezdez's suggestion 2013-07-02 10:03:09 +02:00
Daniel Greenfeld
2f4c1aaf66 Theming instructions second draft 2013-07-01 11:48:28 +02:00
Daniel Greenfeld
8ce2c7eeab Work on the theming instructions 2013-07-01 11:39:43 +02:00
Daniel Greenfeld
00af2cfbac prep for release 0.4.0 2013-06-30 11:38:39 +02:00
Daniel Greenfeld
c036fd723f Update AUTHORS.rst 2013-06-28 19:30:49 +02:00
Daniel Greenfeld
670a3ece72 Merge pull request #219 from tomchristie/patch-1
Moar hyperlinking in the README
2013-06-28 10:30:05 -07:00
Daniel Greenfeld
2fc9a006a2 Fix setup.py to point at the correct URL. 2013-06-27 13:09:03 +02:00
Andrews Medina
1f0856b5d3 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into admin_view 2013-06-26 23:23:48 -03:00
Andrews Medina
bacf9b66cb implemented AdminView.get_view_kwargs method. 2013-06-26 23:22:52 -03:00
Daniel Greenfeld
761651e61a Merge pull request #217 from douglasmiranda/add-basic-login-style
add a basic style for login form
2013-06-25 05:26:38 -07:00
Douglas Miranda
1aa9a02957 add a basic style for login form 2013-06-24 23:49:55 -04:00
Daniel Greenfeld
ecaa2ebef0 Merge pull request #215 from esoergel/standardize_html
Standardize html
2013-06-24 10:15:28 -07:00
Ethan Soergel
b0ff9abf5f converted indentation to two spaces in templates 2013-06-24 11:25:42 -04:00
Ethan Soergel
8644fb02f9 added template best practices to contributing.rst 2013-06-24 11:24:23 -04:00
Daniel Greenfeld
0f56bde069 Adding a contributing document 2013-06-24 16:05:44 +02:00
Daniel Greenfeld
e458766d36 Adding a contributing document 2013-06-24 16:05:10 +02:00
Daniel Greenfeld
ead8ccdc26 Add @ryanbalfanz to the list of authors. 2013-06-24 10:50:02 +03:00
Daniel Greenfeld
f19b5dc0a0 Merge pull request #212 from RyanBalfanz/develop
#205; Added index, select user, and change user page screenshots
2013-06-24 00:48:21 -07:00
Ryan Balfanz
e7f0611eea #205; Added change user screenshot 2013-06-23 21:36:19 -07:00
Ryan Balfanz
2a0e08243f #205; Added select user screenshot 2013-06-23 21:36:03 -07:00
Ryan Balfanz
4dd9d61e2f #205; Added admin index screenshot 2013-06-23 21:35:39 -07:00
Andrews Medina
9ee3275fd0 setting attrname for AdminView default name. 2013-06-23 15:36:01 -03:00
Andrews Medina
4bf06dd6c2 migrating the views to be admin views.
generating the get_urls dynamically and
support permissions.
2013-06-23 02:52:58 -03:00
Andrews Medina
330cafa309 added name argument in AdminView. 2013-06-22 01:30:09 -03:00
Andrews Medina
39bf48ca20 refactored ModelAdminBase2. 2013-06-21 10:16:08 -03:00
Andrews Medina
b44c66e301 implemented ModelAdminBase2 metaclass. 2013-06-21 02:41:28 -03:00
Andrews Medina
7a0f29f2c6 added AdminView. 2013-06-21 00:05:23 -03:00
Daniel Greenfeld
6a6b3d5f79 Removing bad screen capture 2013-06-20 16:46:47 +02:00
Daniel Greenfeld
b166874c10 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-06-20 16:40:57 +02:00
Daniel Greenfeld
b22dc3407a Adding simple screen capture 2013-06-20 16:40:42 +02:00
Daniel Greenfeld
273a950500 Merge pull request #210 from douglasmiranda/add-info-on-authors
add info on AUTHORS
2013-06-19 03:17:02 -07:00
Daniel Greenfeld
6f12cb5e15 Merge pull request #209 from d1ffuz0r/fix_actions_doc
actions docs
2013-06-18 23:04:10 -07:00
Daniel Greenfeld
fb284542f9 Merge pull request #208 from douglasmiranda/fix-jquery-version
fix: issue #199 static jQuery version and add jQuery fallback
2013-06-18 23:02:25 -07:00
d1ffuz0r
b586bd007a fixed actions doc 2013-06-19 12:44:52 +07:00
Douglas Miranda
3b0d8f6910 add info on AUTHORS 2013-06-18 21:36:30 -04:00
Douglas Miranda
d008b3e842 fix: issue #199 static jQuery version and add jQuery fallback 2013-06-18 21:30:16 -04:00
Daniel Greenfeld
dedaadae5f Merge pull request #206 from esoergel/get_example_proj_to_work
minor: fix formatting in contributing.rst and added links to virtualenv and virtualenvwrapper
2013-06-18 10:36:17 -07:00
Ethan Soergel
7e86c1172e Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into get_example_proj_to_work 2013-06-18 13:18:26 -04:00
Ethan Soergel
04ab4a1f4c fixed formatting in contributing.rst and added links to virtualenv and virtualenvwrapper 2013-06-18 13:18:04 -04:00
Daniel Greenfeld
381361b648 Add Ethan Soergel to authors 2013-06-18 18:19:37 +03:00
Daniel Greenfeld
bb3988b7b8 Merge pull request #204 from esoergel/get_example_proj_to_work
added instructions for getting the example projects running to the 'SETUP' section of contributing.rst
2013-06-18 08:18:07 -07:00
Ethan Soergel
d0bfca08af added instructions to run setup.py to contributing.rst 2013-06-18 11:02:14 -04:00
Tom Christie
90c62a33df Add hyperlinks for requirements 2013-06-18 13:46:17 +02:00
Ethan Soergel
5595b68fb5 extended 'SETUP' section of contributing.rst to include instructions for getting the example projects running 2013-06-18 02:16:54 -04:00
d1ffuz0r
256efa679e #154 changed fbc action views behavior to cbv. added breadcrumbs to actions with multiple items 2013-06-17 11:56:37 +07:00
Daniel Greenfeld
5c26287100 Merge pull request #201 from andrewsmedina/get_attr_tests
Added more tests for get_attr templatetag.
2013-06-13 00:33:56 -07:00
Andrews Medina
27544d5a51 Added more tests for get_attr templatetag. 2013-06-12 17:08:21 -03:00
Daniel Greenfeld
edcdb00fbd Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-06-11 21:54:58 +02:00
Daniel Greenfeld
48dd204738 Moar on actions 2013-06-11 21:48:52 +02:00
Daniel Greenfeld
ab31053e9d add douglas miranda to authors 2013-06-10 13:11:14 +03:00
Daniel Greenfeld
86d593a577 Merge pull request #197 from douglasmiranda/fix-navbar-breadcrumb
Fix navbar and breadcrumbs on the login page - issue #196
2013-06-10 03:08:39 -07:00
Douglas Miranda
2ccb399c11 fix navbar and breadcrumb on the login page - issue #196 2013-06-10 02:02:10 -04:00
Daniel Greenfeld
eefab2dec4 Add performance goal to docs 2013-06-09 20:21:35 +02:00
Daniel Greenfeld
8f2f9fa280 Merge pull request #193 from andrewsmedina/list_display_callables
Added support for callabels in list_display.
2013-06-07 01:49:08 -07:00
Daniel Greenfeld
edec446e30 Merge pull request #192 from andrewsmedina/ignoring_vim
ignoring vim swap files.
2013-06-07 01:47:54 -07:00
Daniel Greenfeld
5027b0772b Add Wade Austin / @waustin to authors 2013-06-07 11:12:16 +03:00
Daniel Greenfeld
56466a61bd Merge branch 'implement_search_fields' of git://github.com/waustin/django-admin2 into waustin-implement_search_fields 2013-06-07 10:08:49 +02:00
Andrews Medina
5974642840 Added support for callabels in list_display. 2013-06-07 00:07:24 -03:00
Andrews Medina
7d7be0b696 ignoring vim swap files. 2013-06-06 23:35:00 -03:00
Wade Austin
e199b13c3c search_fields test cases 2013-06-06 16:25:36 -05:00
Wade Austin
a5d728df66 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into implement_search_fields 2013-06-06 16:24:57 -05:00
Wade Austin
095bc1ad5d Override get_queryset in ModelListView to preform a search if needed
Added a get_search_results method to ModelListView based on the logic from django.contrib.admin.views.main.ChangeList
Added search_fields and search_term to the extra context data
2013-06-06 13:00:03 -05:00
Wade Austin
858d39e5f4 Added search_fields to admin and admin2 class for the example project 2013-06-06 12:51:44 -05:00
Wade Austin
2af4aed976 added lookup_needs_distinct from django.contrib.admin 2013-06-06 12:50:45 -05:00
Wade Austin
9ea725600f Add search form to model list template. Form is only displayed if search_fields is not None 2013-06-06 12:49:34 -05:00
Wade Austin
26eeaf14aa Add search_fields to MODEL_ADMIN_ATTRS 2013-06-06 12:48:36 -05:00
Gregor Müllegger
911dcb442a Moving create_extra_permissions to the more appropriate permissions module. 2013-06-06 10:29:10 +02:00
Gregor Müllegger
b88587f682 Adding test to check if view permissions have been created. 2013-06-06 10:29:10 +02:00
Daniel Greenfeld
5ae57ac541 Adding Andrews Medina to the authors list 2013-06-06 10:25:22 +02:00
Andrews Medina
7e58115e11 Added tests for example2 poll delete action. 2013-06-05 23:53:39 -03:00
Andrews Medina
8e4c155c33 Added tests for example2 poll delete view. 2013-06-05 23:50:53 -03:00
Andrews Medina
5ce79eee08 Added tests for example2 poll create view. 2013-06-05 23:48:04 -03:00
Andrews Medina
fde3814fdf Added tests for example2 poll detail view. 2013-06-05 22:58:50 -03:00
Andrews Medina
39df8267c4 Added tests for example2 poll list view. 2013-06-05 22:57:14 -03:00
Andrews Medina
25a9d72322 Added tests for example2 admin index. 2013-06-05 22:35:57 -03:00
Andrews Medina
d2d65bdb3f Merge branch 'develop' of git://github.com/twoscoops/django-admin2 into example2 2013-06-05 22:19:39 -03:00
Andrews Medina
af54f424ed Changed the example2 database name. 2013-06-05 22:19:07 -03:00
Andrews Medina
6d12d7d8e6 Added a home for example2. 2013-06-05 22:17:29 -03:00
Daniel Greenfeld
e6cb526df4 Adding @the5fire to authors. 2013-06-05 11:27:02 +02:00
Daniel Greenfeld
e9cfa3545f Merge pull request #187 from the5fire/fix-dist-no-staticfile
fixed MANIFEST.in without static resources configuration
2013-06-05 02:25:59 -07:00
allenhu
caee5ac214 fixed MANIFEST.in without static resources configuration 2013-06-05 14:47:43 +08:00
Daniel Greenfeld
bb32ae8bf2 Merge pull request #182 from gregmuellegger/issues/181
Fixes #181 -- Choices were not copied for Select widgets for floppified forms
2013-06-04 21:43:22 -07:00
Andrews Medina
b1c7089556 Enabling admin for example2. 2013-06-04 23:07:09 -03:00
Andrews Medina
de37dfb1f8 Fixed Poll was_published_recently. 2013-06-04 23:06:33 -03:00
Andrews Medina
320c6b6d4b Improved PollAdmin. 2013-06-04 22:59:15 -03:00
Andrews Medina
0fe407565d Added admin2 for polls. 2013-06-04 22:46:37 -03:00
Andrews Medina
305d9029fb Added Pool and Choice models for example2. 2013-06-04 22:22:21 -03:00
Andrews Medina
af2bd4d546 Added example2. 2013-06-04 22:10:59 -03:00
Gregor Müllegger
1a04f285ff Fixes #181 -- Choices were not copied for Select widgets for floppified forms. 2013-06-04 22:31:59 +02:00
Daniel Greenfeld
01361d214d Modify the contributing docs 2013-06-04 22:02:08 +02:00
Daniel Greenfeld
b9e178347b Modify the contributing docs 2013-06-04 22:00:49 +02:00
Daniel Greenfeld
806e032032 fixes #165 we now can control what gets displayed 2013-06-04 21:22:28 +02:00
Daniel Greenfeld
777e82672d more docs for #161 2013-06-04 20:30:41 +02:00
Daniel Greenfeld
87d38f0619 for #161 we now support both functions and classes for list actions 2013-06-04 20:18:45 +02:00
Daniel Greenfeld
aaad5636fa Got actions where we want them. #161 2013-06-04 19:24:09 +02:00
Daniel Greenfeld
2be7320425 more cleanup for #161, this includes some documentation 2013-06-04 19:16:25 +02:00
Daniel Greenfeld
1c503be2d8 correcting issue with action permissions #161 2013-06-04 19:12:21 +02:00
Daniel Greenfeld
4fb43db3e8 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-06-04 19:04:05 +02:00
Daniel Greenfeld
9d6cbe3094 Making permissions easier to manage 2013-06-04 19:03:40 +02:00
Daniel Greenfeld
39a4d01706 Test fixes 2013-06-04 11:35:47 +02:00
Daniel Greenfeld
90c5c20cb5 Update AUTHORS.rst 2013-06-04 11:35:22 +02:00
Daniel Greenfeld
b7feb5f284 Merge branch 'drop_down_fires_nothing_selected' of git://github.com/waustin/django-admin2 into waustin-drop_down_fires_nothing_selected 2013-06-04 11:21:07 +02:00
Wade Austin
4b8b8d8b47 Fix for Issue #178
If an action is selected and no objects are selected the message "Items must be selected in order to perform actions on them. No items have been changed." is displayed instead of the user being sent to Action confirmation screen.
2013-06-03 21:09:41 -05:00
Daniel Greenfeld
45855f9b50 German to English 😉 2013-06-03 23:30:48 +02:00
Daniel Greenfeld
5be8972dac Merge branch 'modellist-170' of git://github.com/ludw/django-admin2 into ludw-modellist-170 2013-06-03 23:26:42 +02:00
Audrey Roy
b3bb9dbf82 Merge pull request #177 from audreyr/develop
Merge in @paurosello's commit
2013-06-03 14:05:39 -07:00
Audrey Roy
938369ef50 Add @paurosello for fixing #173 (ending template blocks). 2013-06-03 22:57:40 +02:00
Audrey Roy
03d5ed03f5 Fix merge conflict. Remove extrajs block. 2013-06-03 22:51:15 +02:00
Daniel Greenfeld
bc3c67f375 Merge pull request #176 from audreyr/constants-to-settings-175
Rename constants module to settings
2013-06-03 13:46:16 -07:00
Audrey Roy
cc6e8467c4 Rename constants module to settings 2013-06-03 22:44:16 +02:00
paurosello
b0a8594990 Trying to fix issue #173.
Every block is finished with it's own name.
2013-06-03 22:28:41 +02:00
Daniel Greenfeld
d140086dd1 fixes #172 2013-06-03 20:46:17 +02:00
Ludvig Wadenstein
9c296ccff5 Updated tests 2013-06-02 21:09:04 +02:00
Ludvig Wadenstein
a802dfe8ae Replaced actions select with button dropdown. 2013-06-02 20:58:27 +02:00
Ludvig Wadenstein
574037acfe Chackbox column has apropriate width 2013-06-02 20:18:47 +02:00
Ludvig Wadenstein
c45a544a1d List row links to update or read page based on permissions 2013-06-02 20:17:04 +02:00
Daniel Greenfeld
4ac722add4 Customize the dashboard 2013-06-01 20:04:06 +02:00
Daniel Greenfeld
d52bc0fe15 Document actions 2013-06-01 19:23:15 +02:00
Daniel Greenfeld
c1bb642747 Enhancing documentation 2013-06-01 19:04:51 +02:00
Daniel Greenfeld
7827bf0003 fixes #159 and lays the ground for more things 2013-06-01 18:02:01 +02:00
Daniel Greenfeld
972968b5b1 Move towards internal consistency of URL name definitions 2013-06-01 13:48:53 +02:00
Daniel Greenfeld
26211ac3d2 Merge pull request #169 from audreyr/develop
Fix error on create from model update form.
2013-06-01 03:55:17 -07:00
Audrey Roy
d72d7e4deb Fix error on create from this form. 2013-06-01 12:54:15 +02:00
Audrey Roy
f2c8480a2f Merge pull request #167 from audreyr/develop
Document custom CSS better.
2013-06-01 03:36:36 -07:00
Audrey Roy
68c5f11b85 Document custom CSS better. 2013-06-01 12:35:49 +02:00
Daniel Greenfeld
4e2a45aab9 Merge pull request #164 from audreyr/edit-form-buttons-72
Add delete button to edit form as per issue #72.
2013-05-31 13:22:58 -07:00
Audrey Roy
b389af9bb9 Add delete button to edit form as per issue #72. 2013-05-31 22:21:04 +02:00
Daniel Greenfeld
4cb6f9fc3f Tweaks to the contributing documentation 2013-05-31 21:48:47 +02:00
Daniel Greenfeld
f822eedae9 merge 2013-05-31 17:41:20 +02:00
Daniel Greenfeld
83689f37d6 merge 2013-05-31 17:40:25 +02:00
Daniel Greenfeld
1195f38b84 More work on admin 2013-05-31 17:38:34 +02:00
Daniel Greenfeld
0da6f453b7 For #161, this removes the FBV and implements an easily extendible BaseListAction class 2013-05-31 16:47:25 +02:00
Daniel Greenfeld
1916f7cba4 Change list actions to be list_actions so their nature is more explicit 2013-05-31 15:37:55 +02:00
Gregor Müllegger
0690385b4c Fixes #160 -- Marking a few missed strings as translatable. 2013-05-31 15:37:43 +02:00
Daniel Greenfeld
6a9eb0b3b3 More accurate documentation for how we test merges 2013-05-31 11:42:00 +02:00
Daniel Greenfeld
3ee0bc5da2 Fix setup.py 2013-05-31 10:26:05 +02:00
Daniel Greenfeld
c5153f7707 better 2013-05-31 10:23:11 +02:00
Daniel Greenfeld
16c9b8c3ee prep for v0.3.0 2013-05-31 10:21:02 +02:00
Daniel Greenfeld
be07421d44 Removed admins.py and placed calls to ModelAdmin2 from top namespace 2013-05-31 08:57:25 +02:00
Daniel Greenfeld
bf1657990a replace django.contrib.admin introduced in last pull request with our own native form 2013-05-31 08:49:24 +02:00
Daniel Greenfeld
fd6c0a57b3 Added Roman Gladkov as a contributor, PEP8 and djadmin2 standards fixes 2013-05-31 08:36:09 +02:00
Daniel Greenfeld
9e2349be7f Merge pull request #146 from d1ffuz0r/issue_101
#101 #103 added change password, login, logout views
2013-05-30 23:25:39 -07:00
d1ffuz0r
cff5674539 revert auth tests 2013-05-31 10:37:14 +07:00
d1ffuz0r
db939ef753 fixed names 2013-05-31 08:25:45 +07:00
d1ffuz0r
8dd3cd4133 added tests 2013-05-31 08:21:43 +07:00
d1ffuz0r
b54c28afc1 deleted LoginRequiredMixin 2013-05-31 07:39:58 +07:00
d1ffuz0r
b8413f96e3 change password form dependent from user 2013-05-31 07:24:22 +07:00
d1ffuz0r
2b172fdcc2 merge from develop 2013-05-31 06:55:34 +07:00
d1ffuz0r
6c0978189a login view 2013-05-31 06:20:39 +07:00
d1ffuz0r
17bc5acecf use django-braces for login required views 2013-05-31 06:20:15 +07:00
d1ffuz0r
8ae0644fb9 #101 #103 added change password, logout views 2013-05-31 06:19:33 +07:00
Daniel Greenfeld
9acdf9e2f8 fixes #155, which is moving models.py to types.py. Using admins.py as an alias for the old models.py module 2013-05-30 12:33:00 +02:00
Daniel Greenfeld
096267c674 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:49 +02:00
Daniel Greenfeld
b2fb02b976 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:19 +02:00
Daniel Greenfeld
30d1abe5d4 PEP-8 work 2013-05-30 11:35:58 +02:00
Ben Tappin
06302a7ed6 Tweak NestedObjects (and tests) comments. 2013-05-29 14:10:56 +01:00
Ben Tappin
f4f400734c Use utils.model_options() in views and change utils import. 2013-05-29 14:09:26 +01:00
Ben Tappin
65de6f148f Use utils.model_options(). 2013-05-29 13:50:07 +01:00
Ben Tappin
11f193ffc9 UI improvements when deleting objects.
Shows nested child objects that will be deleted when deleting a single object or multiple objects.

Includes some hacky tests for NestedObjects in the example app.
2013-05-29 12:38:32 +01:00
Daniel Greenfeld
5fcccb6183 Remove print statement. Fixes #143 2013-05-29 12:17:08 +02:00
Gregor Müllegger
b54048c744 Re-wording the variable 'backend' based on @RaphaelKimmig's code review. 2013-05-29 11:00:59 +02:00
Gregor Müllegger
c0a3df680c Fix permission denied errors for API views. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
42d89a7585 Moving permission checking from AdminModel2Mixin to PermissionMixin were it belongs. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
2771d160a7 Using new permission handling in templates. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
8c88362197 Removing old permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
d0635b79c3 Adding a IsSuperuserPermission class. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
2adabfe695 Re-writing the docs about the permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
02a68faadd Adding more information to the docstring of the template permission handler. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
635bbca553 Adding |for_view filter to bind permissions for a view name. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
9ce77ae572 Adding possibility to traverse permissions by admin name. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
2aca9df7e2 Adding possibility to swap model admin that is checked for permissions in the template. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
c6a11efca8 Adding ability to check for permissions of any registered model admin in the templates. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
e7cadd5ab5 Allow ModelAdmin2 instances to have names. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
3b9aca672f Adding documentation about how to use permissions in the template. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
65d54083ce Adding reference documentation for permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
2b268eb089 Setting up autodoc for the docs.
For this to work you need to install sphinx in your virtualenv. It's added to
the requirements.txt so just run: pip install -r requirements.txt
2013-05-29 10:44:22 +02:00
Gregor Müllegger
ab778191c6 Adding the ability to check for permissions in templates. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
324cdbaa17 Moving permission logic of views into its own mixin. Also allow to check permission on other views via the PermissionMixin. 2013-05-29 10:43:09 +02:00
Gregor Müllegger
0c7615b733 Implementing a class-based permission handling. 2013-05-29 10:43:09 +02:00
Daniel Greenfeld
3704fd5441 Merge branch 'breadcrumbs' of git://github.com/AndrewIngram/django-admin2 into AndrewIngram-breadcrumbs 2013-05-28 22:00:44 +02:00
Andrew Ingram
23b0389c1a Rename app-index view to app_index 2013-05-28 13:24:18 +01:00
Andrew Ingram
3bb555fb56 add missing test for utils.model_app_label 2013-05-28 13:24:02 +01:00
Daniel Greenfeld
9c694a9f1c Update AUTHORS.rst 2013-05-27 23:24:04 +02:00
Daniel Greenfeld
36cdb246cc Update AUTHORS.rst 2013-05-27 06:47:00 +02:00
Daniel Greenfeld
e7ad2efe70 Merge pull request #152 from akaptur/remove-python-command-with-python-prompt
Remove 'python -c'
2013-05-26 21:40:48 -07:00
Allison Kaptur
58ffe40eb9 Remove 'python -c'
You should have either `python -c` or '>>>', but not both.  I'm not sure whether "$ python -c 'import this'" or '>>> import this' is better, but the current version is definitely wrong.
2013-05-26 19:20:02 -04:00
Andrew Ingram
9f41c3f56e Initial stab at breadcrumbs
There's currently a lot of copy-pasting of breadcrumbs, this can be revisited once we have a better understanding of how we're going to handle navigation.

I've also tried to make template context variables more logical and consistent throughout.
2013-05-26 01:55:43 +01:00
Daniel Greenfeld
a94416d99e Merge pull request #149 from AndrewIngram/l18n
Template internationalization
2013-05-25 14:26:00 -07:00
Daniel Greenfeld
011560d28a Merge pull request #148 from mrben/admin2-tags-tests
Add tests for admin2 templatetags and fix bug.
2013-05-25 14:25:11 -07:00
Andrew Ingram
a4d77a9309 Template internationalization 2013-05-25 18:44:48 +01:00
Ben Tappin
c79f53bb02 Add tests for admin2 templatetags and fix bug. 2013-05-25 16:45:26 +01:00
Daniel Greenfeld
906b8cbf4e Adding endline to bump things forward 2013-05-24 20:48:43 +02:00
Daniel Greenfeld
3b4ce17142 Adding in note about the model_admin immutable issue 2013-05-24 20:47:38 +02:00
Daniel Greenfeld
99204be715 Added tests for djadmin.utils 2013-05-24 16:22:54 +02:00
Daniel Greenfeld
7abbb94ddd Add Ben Tapin to authors 2013-05-24 13:25:02 +02:00
Ben Tappin
30cacb7569 Use PK instead of ID in the model list view and template. 2013-05-24 12:06:35 +01:00
Daniel Greenfeld
0236a5cc07 small correction on model naming 2013-05-23 22:34:15 +02:00
Daniel Greenfeld
a3eea0aaf9 Merge branch 'bugfix/delete-action-message-display' of git://github.com/chrislawlor/django-admin2 into chrislawlor-bugfix/delete-action-message-display 2013-05-23 22:30:24 +02:00
Daniel Greenfeld
1e1f101397 Merge pull request #135 from gregmuellegger/runtests-args
Allow runtests.py to take positional arguments to specify only a subset of tests to run.
2013-05-23 13:27:16 -07:00
Daniel Greenfeld
dca4d849d7 Merge branch 'floppify-auth-forms' of git://github.com/gregmuellegger/django-admin2 into gregmuellegger-floppify-auth-forms 2013-05-23 22:25:16 +02:00
Gregor Müllegger
5b482a96d0 Adding docs for optional runtests.py arguments. 2013-05-23 22:18:12 +02:00
Gregor Müllegger
d4eb1e4bd3 Allow runtests.py to take positional arguments to specify only a subset of tests that should be run. 2013-05-23 22:04:25 +02:00
Chris Lawlor
396f49665e Fixes message display after action handling.
Calls unicode to force encoding of object name to a localized
unicode string. Also fixes deleted object count by saving
len(queryset) to a local var before calling queryset.delete(), as
the len after queryset.delete() is always zero.
2013-05-23 15:37:50 -04:00
Gregor Müllegger
d10838c2ed Don't copy input_type attribute from original widget when the floppyform widget has a much more appropriate HTML5 type. 2013-05-23 20:59:35 +02:00
Daniel Greenfeld
5f1f91167f test cleanup 2013-05-23 20:22:44 +02:00
Gregor Müllegger
494b999922 Fixed #138 -- UserCreateForm and UserUpdateForm get floppified. 2013-05-23 20:16:19 +02:00
Daniel Greenfeld
0092325262 Used filters to present results of views better for #128 2013-05-23 20:11:04 +02:00
Daniel Greenfeld
611b34fd64 Wrapped all calls to model._meta with model_options function. fix #134 2013-05-23 20:00:14 +02:00
Daniel Greenfeld
d8409a2070 For #134, this moves many independant functions to the utils module and begins conversion of naked ._meta use to using the utils.model_options wrapper 2013-05-23 19:46:03 +02:00
Daniel Greenfeld
638ae91756 PEP-8 work 2013-05-23 19:30:15 +02:00
Daniel Greenfeld
5129541154 merge and adding requirements for floppy-forms 2013-05-23 19:23:23 +02:00
Daniel Greenfeld
a62d3aceff merge conflict resolutions 2013-05-23 13:01:27 +02:00
Gregor Müllegger
77fa844184 Also take form field into account when floppifying widgets. That way all specific floppyform widgets will be used for modelforms (like EmailInput, NumberInput, etc.). 2013-05-22 22:16:03 +02:00
Gregor Müllegger
984b6fb8d4 Using own modelform_factory to produce forms that are using floppyforms widgets. That allows better customization in the frontend. 2013-05-22 19:29:51 +02:00
Gregor Müllegger
188c12d647 Implementing a modelform_factory that takes care of converting all widgets on the modelform to floppyform widgets if possible. 2013-05-22 19:29:12 +02:00
Daniel Greenfeld
af96990275 Move mixins to their own directory so the apiviews aren't directly importing from views 2013-05-22 18:40:53 +02:00
Daniel Greenfeld
cd82aad51b Merge pull request #132 from audreyr/cruft-cleanup
Remove unused Admin2Form class.
2013-05-22 09:01:10 -07:00
Daniel Greenfeld
fdddea7133 Add django-extra-views to dependencies to provide formset controls for contributors 2013-05-22 17:59:07 +02:00
Daniel Greenfeld
a5cb74fb63 Update django.contrib.admin reference file to provide reference for this pull request 2013-05-22 17:58:29 +02:00
Daniel Greenfeld
bb3d4712b9 Merge branch 'inline-formsets' of git://github.com/AndrewIngram/django-admin2 into AndrewIngram-inline-formsets 2013-05-22 17:47:17 +02:00
Daniel Greenfeld
3750288858 Adding to the reference 2013-05-22 17:37:02 +02:00
Peter Inglesby
ade92956d0 Handle actions by POSTing to ModelListView 2013-05-22 11:32:01 +01:00
Peter Inglesby
79e6dfad83 Add delete_selected action 2013-05-22 11:32:01 +01:00
Peter Inglesby
8b6b56a1a8 Add messages to base.html 2013-05-22 11:32:01 +01:00
Peter Inglesby
88c0ce4e9f Remove stray closing tag. 2013-05-22 11:32:01 +01:00
Audrey Roy
0d6ab93b84 Remove unused Admin2Form class. 2013-05-22 10:38:23 +02:00
Andrew Ingram
5abe25e4c2 Fix broken tests 2013-05-22 01:22:39 +01:00
Andrew Ingram
a1ce27d4c2 Improve the rendering of inline form sets 2013-05-22 01:06:25 +01:00
Andrew Ingram
05f69775b2 Merge remote-tracking branch 'origin/develop' into inline-formsets
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_add_form.html
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
	djadmin2/views.py
2013-05-22 00:58:53 +01:00
Audrey Roy
b79523c659 Refactor duplicate model add/edit forms. 2013-05-21 15:45:08 -07:00
Daniel Greenfeld
5836a1cb97 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop 2013-05-22 00:38:24 +02:00
Daniel Greenfeld
192229e513 Fix admin2_tags templatetag reference that was bad 2013-05-22 00:37:14 +02:00
Audrey Roy
cdc8f3b53b Merge branch 'develop' of github.com:twoscoops/django-admin1 into Admin2ModelFormMixin 2013-05-21 23:55:01 +02:00
Audrey Roy
16ceca0dfe Model edit form now reuses save logic 2013-05-21 23:50:50 +02:00
Daniel Greenfeld
1a669cac59 django-debug-toolbar no longer interrupts on form redirects 2013-05-21 23:47:35 +02:00
Daniel Greenfeld
e9fd0abb2f merge 2013-05-21 23:28:28 +02:00
Daniel Greenfeld
ce835ffc79 Merge branch 'feature/save-options' of git://github.com/chrislawlor/django-admin2 into chrislawlor-feature/save-options 2013-05-21 23:18:53 +02:00
Daniel Greenfeld
dda18504d8 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop 2013-05-21 23:15:41 +02:00
Chris Lawlor
f66ffe8c86 Use admin2_url, redirect create form to index view.
Uses the template tag admin2_url to create namespaced view names
from inside of views.

Create model form now redirects to the model index page, as
django.contrib.admin. does.

Removed get_success_url from ModelListView, as generic.ListView
does not call this method.
2013-05-21 14:01:30 -04:00
Daniel Greenfeld
a437aceee9 Match master to develop 2013-05-21 12:45:10 +03:00
Andrew Ingram
c051b8807a Merge remote-tracking branch 'origin/develop' into inline-formsets 2013-05-21 00:11:28 +01:00
Andrew Ingram
262c759604 Merge remote-tracking branch 'origin/develop' into rename-templatetag-module 2013-05-21 00:05:25 +01:00
Andrew Ingram
3dcaeb4023 rename admin2_urls to admin2_tags 2013-05-20 23:45:22 +01:00
Daniel Greenfeld
0e03d7a5b0 bike shedding 2013-05-21 00:25:38 +02:00
Audrey Roy
55168a0ea0 Fix delete text to match original admin. 2013-05-20 23:33:37 +02:00
Chris Lawlor
f9a1540e09 Add 'title' and 'page_title' template blocks.
Makes template page title styling consistent across all templates.
2013-05-20 16:17:44 -04:00
Daniel Greenfeld
ef8afcbb7e Adding @chrislawlor to the list of authors. 2013-05-20 20:40:16 +03:00
Daniel Greenfeld
21a4f94359 Merge pull request #115 from chrislawlor/feature/template-context-refactor
Adds model name to AdminModel2Mixin template context.
2013-05-20 10:38:19 -07:00
Daniel Greenfeld
2b4449a769 Merge pull request #117 from chrislawlor/feature/model-create-page-title
Adds page title to model create page
2013-05-20 10:37:47 -07:00
Daniel Greenfeld
648d5e8d5b Change to git-flow 2013-05-20 19:10:33 +02:00
Daniel Greenfeld
baf573bf11 Added immutable admin object per #99 2013-05-20 18:45:59 +02:00
Daniel Greenfeld
4f08ea2165 PEP-8 before working on #99 2013-05-20 18:09:58 +02:00
Daniel Greenfeld
b9ca57bd00 PEP-8 before working on #99 2013-05-20 18:04:51 +02:00
Chris Lawlor
3d2b347063 Adds model name to AdminModel2Mixin template context.
All views subclassing AdminModel2Mixin will need the model
name in their template context, so moving it to the base
class so child views don't all have to override
get_context_data.
2013-05-20 10:34:35 -04:00
Chris Lawlor
32f5e4802f Adds page title to model create page 2013-05-20 09:07:19 -04:00
Chris Lawlor
c6c44bbdd0 Implements model save options, issue #110 2013-05-20 08:45:34 -04:00
Daniel Greenfeld
e0d1ed7c22 More design thoughts 2013-05-20 12:35:26 +02:00
Daniel Greenfeld
47b4171bd7 bullets to points 2013-05-20 12:19:34 +02:00
Daniel Greenfeld
b0abe58121 Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:55:29 +02:00
Daniel Greenfeld
d43ec6818a Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:53:48 +02:00
Daniel Greenfeld
f043b382d5 Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:52:46 +02:00
Daniel Greenfeld
2677ed16a9 documentation version bump 2013-05-20 10:45:37 +02:00
Daniel Greenfeld
89ef5ad0a1 architecture warning 2013-05-20 10:38:08 +02:00
Daniel Greenfeld
77e1e994b2 Add design to contributing 2013-05-20 10:37:29 +02:00
Daniel Greenfeld
339acc4bf3 architecture thoughts 2013-05-20 10:33:31 +02:00
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +02:00
Daniel Greenfeld
38b11f0f61 Change README so people get an idea as to what we want 2013-05-20 00:48:38 +02:00
Daniel Greenfeld
a2f73e0fb5 Merge pull request #108 from ludw/headerui
Header UI style
2013-05-19 15:46:32 -07:00
Daniel Greenfeld
83eb8da62a Merge pull request #107 from ludw/master
Fixed small issue in modellistview
2013-05-19 15:45:57 -07:00
Ludvig Wadenstein
7c08296772 Fixed bug with modellist if more than one item 2013-05-19 20:56:41 +02:00
Ludvig Wadenstein
36491b4894 Replaced change password and logout links with dropdown 2013-05-19 20:46:14 +02:00
Andrew Ingram
c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
2013-05-19 19:17:51 +01:00
Ludvig Wadenstein
0d8bfd1914 Merge remote-tracking branch 'upstream/master' 2013-05-19 15:52:05 +02:00
Ludvig Wadenstein
ff54b31abf Merge remote-tracking branch 'upstream/master' 2013-05-19 14:44:30 +02:00
Andrew Ingram
0ebedc8dfd Merge remote-tracking branch 'origin/master' into inline-formsets 2013-05-19 13:11:01 +02:00
Andrew Ingram
2e772ce8a3 Basic support for inline form sets 2013-05-19 11:21:25 +02:00
281 changed files with 17617 additions and 1178 deletions

22
.coveragerc Normal file
View file

@ -0,0 +1,22 @@
[run]
include =
djadmin2*
example*
omit =
*/tests*
[report]
# Regexes for lines to exclude from consideration
exclude_lines =
# Don't complain about missing debug-only code:
def __repr__
if self\.debug
# Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError
# Don't complain if non-runnable code isn't run:
if 0:
if False:
if __name__ == .__main__.:

53
.github/workflows/release.yml vendored Normal file
View file

@ -0,0 +1,53 @@
name: Release
on:
push:
tags:
- '*'
jobs:
build:
if: github.repository == 'jazzband/django-admin2'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: Cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: release-${{ hashFiles('**/setup.py') }}
restore-keys: |
release-
- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U setuptools twine wheel
- name: Build package
run: |
python setup.py --version
python setup.py sdist --format=gztar bdist_wheel
twine check dist/*
- name: Upload packages to Jazzband
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@master
with:
user: jazzband
password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
repository_url: https://jazzband.co/projects/django-admin2/upload

47
.github/workflows/test.yml vendored Normal file
View file

@ -0,0 +1,47 @@
name: Test
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
matrix:
python-version: [3.5, 3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Get pip cache dir
id: pip-cache
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: Cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key:
-${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
restore-keys: |
-${{ matrix.python-version }}-v1-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade tox tox-gh-actions
- name: Tox tests
run: |
tox -v
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
name: Python ${{ matrix.python-version }}

25
.gitignore vendored
View file

@ -1,6 +1,7 @@
*.py[co]
# Packages
.eggs/
*.egg
*.egg-info
dist
@ -20,10 +21,7 @@ pip-log.txt
.coverage
.tox
#Translations
*.mo
#Mr Developer
# Mr Developer
.mr.developer.cfg
# Django
@ -42,7 +40,6 @@ coverage
# Sphinx
docs/_build
docs/_static
# Launchpad
lp-cache
@ -52,4 +49,20 @@ _data
logfile
# SQLite
*.db
*.db
# vim swap files
*.sw[o-z]
# Sublime Text
*.sublime-workspace
*.sublime-project
# test media upload
media
# PyCharm
.idea/
.cache
.pytest_cache

View file

@ -1,10 +0,0 @@
language: python
python:
- "2.7"
before_install:
- export PIP_USE_MIRRORS=true
- export PIP_INDEX_URL=https://simple.crate.io/
install:
- pip install -r requirements.txt
script:
- python runtests.py

View file

@ -1,12 +1,21 @@
CONTRIBUTORS
============
Project Lead
===============
------------
* Daniel Greenfeld <pydanny@gmail.com>
* Asif Saif Uddin (@auvipy)
* Daniel Greenfeld (@pydanny / <pydanny@gmail.com>)
Translation Managers
--------------------
* Henri Colas (@NotSqrt)
* Danilo Bargen (@dbrgn)
* Asif Saif Uddin (@auvipy)
Developers
=============
----------
* Audrey Roy (@audreyr)
* Peter Ingelsby (@inglesp)
@ -15,3 +24,78 @@ Developers
* Andrew Ingram (@AndrewIngram)
* Gregor Müllegger (@gregmuellegger)
* Rivo Laks (@rivol)
* Chris Lawlor (@chrislawlor)
* Ben Tappin <ben@mrben.co.uk>
* Allison Kapture (@akapture)
* Roman Gladkov (@d1ffuz0r / <d1fffuz0r@gmail.com>)
* Pau Rosello Van Schoor (@paurosello)
* Wade Austin (@waustin)
* the5fire (@the5fire)
* Andrews Medina (@andrewsmedina / <andrewsmedina@gmail.com>)
* Wade Austin (@waustin)
* Douglas Miranda (@douglasmiranda / <douglasmirandasilva@gmail.com>)
* Ethan Soergel (@esoergel / <esoergel@gmail.com>)
* Ryan Balfanz (@RyanBalfanz / <ryan@ryanbalfanz.net>)
* Tom Christie (@tomchristie)
* Chris Jones (@chrisjones-brack3t / <chris@brack3t.com>)
* Danilo Bargen (@dbrgn)
* Ignasi Fosch Alonso (@ifosch)
* Henri Colas (@NotSqrt)
* Andy Boot (@bootandy)
* Eleonore Mayola (@Eleonore9)
* Michal Kuffa (@beezz / Michal Kuffa)
* Tom Viner (@tomviner)
* Marek Zelinkaa (@marekzelinka)
* Andrea de Marco (@z4r)
* Kenneth Love (@kennethlove / <kenneth@gigantuan.net>)
* Kevin Diale (@powersurge360 / <powersurge360@gmail.com>)
* James Rivett-Carnac (@yarbelk / james.rivettcarnac@gmail.com)
* Andrew Mosson (@amosson / amosson@tippit.com)
* marangonico
* Kamil Gałuszka (@galuszkak / galuszkak@gmail.com)
* Germano Gabbianelli (@tyrion)
* Arthur (@arthur-wsw / arthur@wallstreetweb.net)
Translators
-----------
Catalan
* Ignasi Fosch Alonso (@NaTx)
Chinese
* Eric Ho (@EricHo)
* Shiyao.Ma (@introom)
French
* Henri Colas (@NotSqrt)
German
* Danilo Bargen (@dbrgn)
* Jannis Leidel (@jezdez)
* Albrecht Mühlenschulte (@a7p)
Italian
* Margherita Zamponi (@margherita.zamponi)
Polish
* Dariusz Smigiel (@dasm)
* Marcin Jabrzyk (@bzyx)
Portuguese (Brazil)
* andrewsmedina
Slovak
* Marek Zelinkaa (@marekzelinka)
* Ivana Kellyérová (@eruraina)
Spanish
* Ignasi Fosch Alonso (@NaTx)

46
CODE_OF_CONDUCT.md Normal file
View file

@ -0,0 +1,46 @@
# Code of Conduct
As contributors and maintainers of the Jazzband projects, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating documentation,
submitting pull requests or patches, and other activities.
We are committed to making participation in the Jazzband a harassment-free experience
for everyone, regardless of the level of experience, gender, gender identity and
expression, sexual orientation, disability, personal appearance, body size, race,
ethnicity, age, religion, or nationality.
Examples of unacceptable behavior by participants include:
- The use of sexualized language or imagery
- Personal attacks
- Trolling or insulting/derogatory comments
- Public or private harassment
- Publishing other's private information, such as physical or electronic addresses,
without explicit permission
- Other unethical or unprofessional conduct
The Jazzband roadies have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are not
aligned to this Code of Conduct, or to ban temporarily or permanently any contributor
for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
By adopting this Code of Conduct, the roadies commit themselves to fairly and
consistently applying these principles to every aspect of managing the jazzband
projects. Roadies who do not follow or enforce the Code of Conduct may be permanently
removed from the Jazzband roadies.
This code of conduct applies both within project spaces and in public spaces when an
individual is representing the project or its community.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
contacting the roadies at `roadies@jazzband.co`. All complaints will be reviewed and
investigated and will result in a response that is deemed necessary and appropriate to
the circumstances. Roadies are obligated to maintain confidentiality with regard to the
reporter of an incident.
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version
1.3.0, available at [https://contributor-covenant.org/version/1/3/0/][version]
[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/3/0/

16
CONTRIBUTING.rst Normal file
View file

@ -0,0 +1,16 @@
Contributing
============
.. image:: https://jazzband.co/static/img/jazzband.svg
:target: https://jazzband.co/
:alt: Jazzband
This is a `Jazzband <https://jazzband.co>`_ project. By contributing you agree to abide by the `Contributor Code of Conduct <https://jazzband.co/about/conduct>`_ and follow the `guidelines <https://jazzband.co/about/guidelines>`_.
Also, please read the following:
* Our design_ document, which lists the constraints and goals of the project.
* Our contributing_ document, which describes our procedures and methods.
.. _design: https://django-admin2.readthedocs.io/en/latest/design.html
.. _contributing: https://django-admin2.readthedocs.io/en/latest/contributing.html

140
HISTORY.rst Normal file
View file

@ -0,0 +1,140 @@
History
=========
0.7.0 (2016-11-16)
* Fix Django 1.8 issues and add 1.9, 1.10 compatibility
* Update django-rest-framework to 3.3.x
* Remove django-crispy-forms and django-floppyforms
* Regenerate example project to make it django 1.9 compatible
* Update tox and travis and add flake8
* Rename AdminModel2Mixin to Admin2ModelMixin
* Add migrations
* remove south migrations
* Replace IPAddressField with GenericIPAddressField
* Fix password link in user admin
* Fix user logout on password change
* Fix tests
* Drop support of django versions lower then 1.8
* Drop older url.patterns
0.6.1 (2014-02-26)
* Fix empty form display
* Added more explicit installation instructions
* Added migration instructions
* Added view descriptions for "registry" and "app_verbose_names"
* Show a nice message and margin if there are no visible fields
* Updated widget controls for Django 1.6 changes.
* Better error messages for admin views that fail to instantiate
* Added png glyphicons to MANIFEST
0.6.0 (2013-09-12)
* Implemented LogHistory to track recent history
* New system for adding new views to ModelAdmin2 object
* Fixed missing enctype="multipart/form-data" functionality
* Implemented "app verbose name"
* Apps can have customized names
* List Actions can be set so they don't require selecting a model
* Implemented ModelAdmin2.ordering
* To maintain API consistency, renamed views.AdminView's "url" argument to "regex"
* Implemented ModelAdmin2.date_hierarchy
* Changed theming system to make default theme follow the same rules as third-party themes.
* Inlines now separated into stacked and tabular formats
* Code coverage now displaying in README
* User list page now showing all default columns and filters
* Vast documentation improvements
* Converted to ``django.utils.encoding.force_str`` instead ``unicode`` in order to type edge cases
* setup.py fix
0.5.1 (2013-07-14)
* No longer pinning dependencies on specific versions
* `Documentation on built-in views`_ shows context variables.
* Added django-filter to dependency list
* Problem with related_name resolved
* Fixed the height of the change_form
* Example app actually shows added content
* Pull requests going forward are internationalized_
* FAQ_ begun
.. _`internationalized`: https://django-admin2.readthedocs.io/en/latest/contributing.html#internationalize
.. _`Documentation on built-in views`: https://django-admin2.readthedocs.io/en/latest/ref/built-in-views.html
.. _faq: https://django-admin2.readthedocs.io/en/latest/faq.html
0.5.0 (2013-07-08)
* Implemented customizable value renderers
* Implemented list filters using django-filters. Greatly supersedes what Django provides.
* Implemented ModelAdmin2.save_on_top and ModelAdmin2.save_on_bottom
* Implemented BooleanField icons for List and Detail views
* Implemented default ``django.contrib.auth`` and ``django.contrib.sites`` registrations
* Implemented the displayed of verbose field/method names in list view
* Implemented client-side ordering of model list fields in default theme
* Implemented improved internal naming conventions
* Improved example project home page
* Improved internal test coverage
* Documentation for Context Variables in Themes
* Corrected early nomenclature decisions
* Much improved Internationalization
* Added django-admin2 to Transifex
* Translations for French, Polish, Slovak, Chinese, German, Catalan, Italian, and Spanish.
0.4.0 (2013-06-30)
* Implemented both Function- and Class-based Action views
* Implemented ModelAdmin2.list_display
* Implemented ModelAdmin2.fieldsets
* Dropdown widget now displays the selected choice
* Added support for callables in ModelAdmin2.list_display
* Added screenshots to README
* Added second example project
* Fixed breadcrumbs
* Default theme: Proper closing of template and media blocks
* Default theme: Standardized indentation in default theme templates
* Default theme: Pointed to CDN for JQuery
* Default theme: Added basic style for login form
* Default theme: Internationalized all text strings
0.3.0 (2013-05-31)
* HTML5 forms via floppyforms.
* Many API improvements.
* Added Breadcrumbs.
* Added Login, Logout, ChangePassword views.
* Added Actions.
* Added support for inlines.
* Added view based permission controls
* Implement delete confirmations for child models.
* Testrunner now can run on a specific test set or module.
* Internal code refactoring to follow standards.
* Moved to git-flow for accepting pull requests.
* Model create/update pages now have save options.
* Added i18n to all templates, much of internal code.
* All print statements replaced with proper logging.
* Design goals specified in the documentation.
0.2.0 (2013-05-19)
* Birth! (Working Prototype)
* Easy-to-extend API that follows similar patterns to django.contrib.admin.
* Built-in RESTFUL API powered by django-rest-framework.
* Default theme built on Twitter Bootstrap.
* Easy to implement theme system.
* Basic permission controls.
* Testrunner
* Documentation
0.1.1 (2013-05-17)
* Code adoption from django-mongonaut.
* Preperation for Django Circus sprints.
0.1 (2013-05-13)
* Discussion with Russell Keith-Magee.
* Inception.

View file

@ -1,4 +1,6 @@
include README.rst
include LICENSE
include AUTHORS.rst
include MANIFEST.in
include HISTORY.rst
include MANIFEST.in
recursive-include djadmin2 *.html *.css *.js *.png

View file

@ -1,93 +1,225 @@
===============
=============
django-admin2
===============
=============
.. image:: https://travis-ci.org/pydanny/django-admin2.png
:alt: Build Status
:target: https://travis-ci.org/pydanny/django-admin2
.. image:: https://jazzband.co/static/img/badge.svg
:target: https://jazzband.co/
:alt: Jazzband
.. image:: https://github.com/jazzband/django-admin2/workflows/Test/badge.svg
:target: https://github.com/jazzband/django-admin2/actions
:alt: GitHub Actions
.. image:: https://codecov.io/gh/jazzband/django-admin2/branch/main/graph/badge.svg?token=PcC594rhI4
:target: https://codecov.io/gh/jazzband/django-admin2
:alt: Code coverage
**Warning:** This project is currently in an **alpha** state and currently not meant for real projects.
One of the most useful parts of ``django.contrib.admin`` is the ability to
configure various views that touch and alter data. django-admin2 is a complete
rewrite of that library using modern Class-Based Views and enjoying a design
focused on extendibility and adaptability. By starting over, we can avoid the
legacy code and make it easier to write extensions and themes.
One of the most useful parts of ``django.contrib.admin`` is the ability to configure various views that touch and alter data. django-admin2 is a complete rewrite of that library using modern Class-Based Views and enjoying a design focused on extendibility and adaptability. By starting over, we can avoid the legacy code and make it easier to write extensions and themes.
Full Documentation at: https://django-admin2.readthedocs.io/
Features (current)
====================
Features
========
* Easy-to-extend API that follows similar patterns to ``django.contrib.admin``.
* Built-in RESTFUL API powered by ``django-rest-framework``.
* Default theme built on Twitter Bootstrap that is just starting to act like the current Django admin.
* Easy to implement theme system.
* Basic permission controls.
* Rewrite of the Django Admin backend
* Drop-in themes
* Built-in RESTful API
Features (Planned)
====================
Screenshots
===========
* Much improved documentation including tutorials and reference guides.
.. image:: https://github.com/jazzband/django-admin2/raw/main/screenshots/Site_administration.png
:width: 722px
:alt: Site administration
:align: center
:target: https://github.com/jazzband/django-admin2/raw/main/screenshots/Site_administration.png
* Extending existing views
* Interacting with the basic Admin2 object.
* Improved permission controls
.. image:: https://github.com/jazzband/django-admin2/raw/main/screenshots/Select_user.png
:width: 722px
:alt: Select user
:align: center
:target: https://github.com/jazzband/django-admin2/raw/main/screenshots/Select_user.png
Requirements
=============
============
* Django 1.5+
* Python 2.7+ (Python 3.3+ support is pending)
* django-braces
* django-rest-framework
* django-floppyforms
* Sphinx (for documentation)
* Django 2.2+
* Python 3.5+
* django-braces_
* django-extra-views_
* django-rest-framework_
* django-filter_
* Sphinx_ (for documentation)
Contributing
=============
.. _django-braces: https://github.com/brack3t/django-braces
.. _django-extra-views: https://github.com/AndrewIngram/django-extra-views
.. _django-rest-framework: https://github.com/tomchristie/django-rest-framework
.. _django-filter: https://github.com/alex/django-filter
.. _Sphinx: http://sphinx-doc.org/
Yes please! Please read our formal contributing document at: https://github.com/pydanny/django-admin2/blob/master/docs/contributing.rst
Basic Pattern
==============
Our goal is to make this API work:
Installation
============
Use pip to install from PyPI:
.. code-block:: python
pip install django-admin2
Add djadmin2 and rest_framework to your settings file:
.. code-block:: python
INSTALLED_APPS = (
...
'djadmin2',
'rest_framework', # for the browsable API templates
...
)
Add setting for apps and the default theme in your settings file:
.. code-block:: python
# In settings.py
INSTALLED_APPS += ('djadmin2.themes.djadmin2theme_bootstrap3',)
REST_FRAMEWORK = {
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
'PAGE_SIZE': 10
}
ADMIN2_THEME_DIRECTORY = "djadmin2theme_bootstrap3"
Add djadmin2 urls to your URLconf:
.. code-block:: python
# urls.py
from django.conf.urls import include
from djadmin2.site import djadmin2_site
djadmin2_site.autodiscover()
urlpatterns = [
...
url(r'^admin2/', include(djadmin2_site.urls)),
]
How to write django-admin2 modules
==================================
.. code-block:: python
# myapp/admin2.py
# Import your custom models
from .models import Post, Comment
from django.contrib.auth.forms import UserCreationForm, UserChangeForm
from django.contrib.auth.models import User
from djadmin2.site import djadmin2_site
from djadmin2.types import ModelAdmin2
import djadmin2
from djadmin2.models import ModelAdmin2
from .models import Post, Comment
class UserAdmin2(ModelAdmin2):
# Replicates the traditional admin for django.contrib.auth.models.User
create_form_class = UserCreationForm
update_form_class = UserChangeForm
# Register each model with the admin
djadmin2.default.register(Post)
djadmin2.default.register(Comment)
djadmin2.default.register(User, UserAdmin2)
djadmin2_site.register(Post)
djadmin2_site.register(Comment)
djadmin2_site.register(User, UserAdmin2)
Migrating from 0.6.x
====================
Themes
========
- The default theme has been updated to bootstrap3, be sure to replace your reference to the new one.
- Django rest framework also include multiple pagination system, the only one supported now is the PageNumberPagination.
Therefore, your `settings` need to include this:
.. code-block:: python
# In settings.py
INSTALLED_APPS += ('djadmin2.themes.djadmin2theme_bootstrap3',)
ADMIN2_THEME_DIRECTORY = "djadmin2theme_bootstrap3"
REST_FRAMEWORK = {
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
'PAGE_SIZE': 10
}
The default admin2 site has move into djadmin2.site make sure your use the news djadmin2_site in your urls.py:
.. code-block:: python
# urls.py
from django.conf.urls import include
from djadmin2.site import djadmin2_site
djadmin2_site.autodiscover()
urlpatterns = [
...
url(r'^admin2/', include(djadmin2_site.urls)),
]
Migrating from 0.5.x
====================
Themes are now defined explicitly, including the default theme. Therefore, your `settings` need to include this:
.. code-block:: python
# In settings.py
INSTALLED_APPS += ('djadmin2.themes.djadmin2theme_default',)
ADMIN2_THEME_DIRECTORY = "djadmin2theme_default"
Drop-In Themes
==============
The default theme is whatever bootstrap is most current. Specifically:
.. code-block:: python
ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/"
# In settings.py
INSTALLED_APPS += ('djadmin2.themes.djadmin2theme_bootstrap3',)
ADMIN2_THEME_DIRECTORY = "djadmin2theme_bootstrap3"
If you create a new theme, please define it thus:
If you create a new theme, you define it thus:
.. code-block:: python
ADMIN2_THEME_DIRECTORY = "admin2/foundation/"
# In settings.py
# Mythical theme! This does not exit... YET!
INSTALLED_APPS += ('djadmin2theme_foundation',)
ADMIN2_THEME_DIRECTORY = "djadmin2theme_foundation"
REST API
==========
We plan to expose a REST API using Django Rest Framework. From this, you can define new themes powered by the client framework of your choice.
Code of Conduct
======================
Everyone interacting in the django-admin2 project's codebases, issue trackers, chat
rooms, and mailing lists is expected to follow the `Jazzband Code of Conduct`_.
.. _`Jazzband Code of Conduct`: https://jazzband.co/about/conduct
Follows Best Practices
======================
.. image:: http://twoscoops.smugmug.com/Two-Scoops-Press-Media-Kit/i-C8s5jkn/0/O/favicon-152.png
:name: Two Scoops Logo
:align: center
:alt: Two Scoops of Django
:target: http://twoscoopspress.org/products/two-scoops-of-django-1-8
This project follows best practices as espoused in `Two Scoops of Django: Best Practices for Django 1.8`_.
.. _`Two Scoops of Django: Best Practices for Django 1.8`: http://twoscoopspress.org/products/two-scoops-of-django-1-8

View file

@ -1,4 +1,4 @@
__version__ = '0.2.0'
__version__ = '0.7.1'
__author__ = 'Daniel Greenfeld & Contributors'
@ -7,7 +7,4 @@ VERSION = __version__ # synonym
# Default datetime input and output formats
ISO_8601 = 'iso-8601'
from . import core
default = core.Admin2()
default_app_config = "djadmin2.apps.Djadmin2Config"

171
djadmin2/actions.py Normal file
View file

@ -0,0 +1,171 @@
from django.contrib import messages
from django.db import router
from django.utils.encoding import force_str
from django.utils.text import capfirst
from django.utils.translation import gettext as _
from django.utils.translation import gettext_lazy, ngettext, pgettext_lazy
from django.views.generic import TemplateView
from . import permissions, utils
from .viewmixins import Admin2ModelMixin
def get_description(action):
if hasattr(action, 'description'):
# This is for classes
return action.description
else:
# This if for functions
return capfirst(action.__name__.replace('_', ' '))
class BaseListAction(Admin2ModelMixin, TemplateView):
permission_classes = (permissions.IsStaffPermission,)
empty_message = gettext_lazy(
'Items must be selected in order to perform actions '
'on them. No items have been changed.'
)
only_selected = True
queryset = None
def __init__(self, queryset, *args, **kwargs):
self.queryset = queryset
self.model = queryset.model
options = utils.model_options(self.model)
self.app_label = options.app_label
self.model_name = options.model_name
self.item_count = len(queryset)
if self.item_count <= 1:
objects_name = options.verbose_name
else:
objects_name = options.verbose_name_plural
self.objects_name = force_str(objects_name)
super().__init__(*args, **kwargs)
def get_queryset(self):
""" Replaced `get_queryset` from `Admin2ModelMixin`"""
return self.queryset
def description(self):
raise NotImplementedError("List action classes require"
" a description attribute.")
@property
def success_message(self):
raise NotImplementedError(
"List actions classes require a success_message"
)
@property
def success_message_plural(self):
"""
A plural form for the success_message
If not provided, falls back to the regular form
"""
return self.success_message
@property
def default_template_name(self):
raise NotImplementedError(
"List actions classes using display_nested_response"
" require a template"
)
def get_context_data(self, **kwargs):
""" Utility method when you want to display nested objects
(such as during a bulk update/delete)
"""
context = super().get_context_data()
def _format_callback(obj):
opts = utils.model_options(obj)
return '%s: %s' % (force_str(capfirst(opts.verbose_name)),
force_str(obj))
using = router.db_for_write(self.model)
collector = utils.NestedObjects(using=using)
collector.collect(self.queryset)
context.update({
'view': self,
'objects_name': self.objects_name,
'queryset': self.queryset,
'deletable_objects': collector.nested(_format_callback),
})
return context
def get(self, request):
if self.item_count > 0:
return super().get(request)
message = _(self.empty_message)
messages.add_message(request, messages.INFO, message)
return None
def post(self, request):
if self.process_queryset() is None:
# objects_name should already be pluralized, see __init__
message = ngettext(
self.success_message,
self.success_message_plural,
self.item_count
) % {
'count': self.item_count, 'items': self.objects_name
}
messages.add_message(request, messages.INFO, message)
return None
def process_queryset(self):
msg = 'Must be provided to do some actions with queryset'
raise NotImplementedError(msg)
class DeleteSelectedAction(BaseListAction):
# TODO: Check that user has permission to delete all related obejcts. See
# `get_deleted_objects` in contrib.admin.util for how this is currently
# done. (Hint: I think we can do better.)
default_template_name = "actions/delete_selected_confirmation.html"
description = gettext_lazy("Delete selected items")
success_message = pgettext_lazy(
'singular form',
'Successfully deleted %(count)s %(items)s',
)
success_message_plural = pgettext_lazy(
'plural form',
'Successfully deleted %(count)s %(items)s',
)
permission_classes = BaseListAction.permission_classes + (
permissions.ModelDeletePermission,
)
def post(self, request):
if request.POST.get('confirmed'):
super().post(request)
else:
# The user has not confirmed that they want to delete the
# objects, so render a template asking for their confirmation.
return self.get(request)
def process_queryset(self):
# The user has confirmed that they want to delete the objects.
self.get_queryset().delete()

55
djadmin2/admin2.py Normal file
View file

@ -0,0 +1,55 @@
from django.conf import settings
from django.contrib.auth.models import Group, User
from django.contrib.sites.models import Site
from rest_framework.relations import PrimaryKeyRelatedField
from djadmin2.apiviews import Admin2APISerializer
from djadmin2.forms import UserCreationForm, UserChangeForm
from djadmin2.site import djadmin2_site
from djadmin2.types import ModelAdmin2
class GroupSerializer(Admin2APISerializer):
permissions = PrimaryKeyRelatedField(many=True, read_only=True)
class Meta:
model = Group
fields = '__all__'
class GroupAdmin2(ModelAdmin2):
api_serializer_class = GroupSerializer
class UserSerializer(Admin2APISerializer):
user_permissions = PrimaryKeyRelatedField(many=True, read_only=True)
class Meta:
model = User
exclude = ('password',)
class UserAdmin2(ModelAdmin2):
create_form_class = UserCreationForm
update_form_class = UserChangeForm
search_fields = ('username', 'groups__name', 'first_name', 'last_name',
'email')
list_filter = ('is_staff', 'is_superuser', 'is_active', 'groups')
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
api_serializer_class = UserSerializer
# Register each model with the admin
djadmin2_site.register(User, UserAdmin2)
djadmin2_site.register(Group, GroupAdmin2)
# Register the sites app if it's been activated in INSTALLED_APPS
if "django.contrib.sites" in settings.INSTALLED_APPS:
class SiteAdmin2(ModelAdmin2):
list_display = ('domain', 'name')
search_fields = ('domain', 'name')
djadmin2_site.register(Site, SiteAdmin2)

View file

@ -1,21 +1,44 @@
from django.utils.encoding import force_str
from rest_framework import fields, generics, serializers
from rest_framework.response import Response
from rest_framework.reverse import reverse
from rest_framework.reverse import reverse as drf_reverse
from rest_framework.views import APIView
from .views import Admin2Mixin
from . import utils
from .viewmixins import Admin2Mixin
API_VERSION = '0.1'
class Admin2APISerializer(serializers.HyperlinkedModelSerializer):
_default_view_name = 'admin2:%(app_label)s_%(model_name)s_api-detail'
_default_view_name = 'admin2:%(app_label)s_%(model_name)s_api_detail'
pk = fields.Field(source='pk')
__str__ = fields.Field(source='__unicode__')
pk = fields.ReadOnlyField()
__unicode__ = fields.ReadOnlyField(source='__str__')
def get_extra_kwargs(self):
extra_kwargs = super().get_extra_kwargs()
extra_kwargs.update({
'url': {'view_name': self._get_default_view_name(self.Meta.model)}
})
return extra_kwargs
def _get_default_view_name(self, model):
"""
Return the view name to use if 'view_name' is not specified in 'Meta'
"""
model_meta = model._meta
format_kwargs = {
'app_label': model_meta.app_label,
'model_name': model_meta.object_name.lower()
}
return self._default_view_name % format_kwargs
class Admin2APIMixin(Admin2Mixin):
model = None
raise_exception = True
def get_serializer_class(self):
if self.serializer_class is None:
model_class = self.get_model()
@ -26,34 +49,39 @@ class Admin2APIMixin(Admin2Mixin):
# Admin2APISerializer base class
_default_view_name = ':'.join((
self.model_admin.admin.name,
'%(app_label)s_%(model_name)s_api-detail'))
'%(app_label)s_%(model_name)s_api_detail'))
class Meta:
model = model_class
fields = '__all__'
return ModelAPISerilizer
return super(Admin2APIMixin, self).get_serializer_class()
return super().get_serializer_class()
class IndexAPIView(Admin2APIMixin, APIView):
apps = None
registry = None
app_verbose_names = None
app_verbose_name = None
def get_model_data(self, model):
model_admin = self.registry[model]
model_options = utils.model_options(model)
opts = {
'current_app': model_admin.admin.name,
'app_label': model._meta.app_label,
'model_name': model._meta.object_name.lower(),
'app_label': model_options.app_label,
'model_name': model_options.object_name.lower(),
}
model_url = reverse(
'%(current_app)s:%(app_label)s_%(model_name)s_api-list' % opts,
model_url = drf_reverse(
'%(current_app)s:%(app_label)s_%(model_name)s_api_list' % opts,
request=self.request,
format=self.kwargs.get('format'))
model_options = utils.model_options(model)
return {
'url': model_url,
'verbose_name': force_str(model._meta.verbose_name),
'verbose_name_plural': force_str(model._meta.verbose_name_plural),
'verbose_name': force_str(model_options.verbose_name),
'verbose_name_plural': force_str(model_options.verbose_name_plural),
}
def get_app_data(self, app_label, models):
@ -63,6 +91,7 @@ class IndexAPIView(Admin2APIMixin, APIView):
return {
'app_label': app_label,
'models': model_data,
'app_verbose_name': force_str(self.app_verbose_names.get(app_label))
}
def get(self, request):

16
djadmin2/apps.py Normal file
View file

@ -0,0 +1,16 @@
from django.apps import AppConfig
from django.db.models.signals import post_migrate
from django.utils.translation import gettext_lazy as _
from djadmin2.permissions import create_view_permissions
class Djadmin2Config(AppConfig):
name = 'djadmin2'
verbose_name = _("Django Admin2")
def ready(self):
post_migrate.connect(
create_view_permissions,
dispatch_uid="django-admin2.djadmin2.permissions.create_view_permissions"
)

View file

@ -0,0 +1,254 @@
import django
import floppyforms
from copy import deepcopy
_WIDGET_COMMON_ATTRIBUTES = (
'is_hidden',
'needs_multipart_form',
'is_localized',
'is_required')
_WIDGET_COMMON_ARGUMENTS = ('attrs',)
def _copy_attributes(original, new_widget, attributes):
for attr in attributes:
original_value = getattr(original, attr)
original_value = deepcopy(original_value)
# Don't set the attribute if it is a property. In that case we can be
# sure that the widget class is taking care of the calculation for that
# property.
old_value_on_new_widget = getattr(new_widget.__class__, attr, None)
if not isinstance(old_value_on_new_widget, property):
setattr(new_widget, attr, original_value)
def _create_widget(widget_class, copy_attributes=(), init_arguments=()):
# attach defaults that apply for all widgets
copy_attributes = tuple(copy_attributes) + _WIDGET_COMMON_ATTRIBUTES
init_arguments = tuple(init_arguments) + _WIDGET_COMMON_ARGUMENTS
def create_new_widget(original):
kwargs = {}
for argname in init_arguments:
kwargs[argname] = getattr(original, argname)
new_widget = widget_class(**kwargs)
_copy_attributes(
original,
new_widget,
copy_attributes)
return new_widget
return create_new_widget
def _create_radioselect(original):
# return original widget if the renderer is something else than what
# django ships with by default. This means if this condition evaluates to
# true, then a custom renderer was specified. We cannot emulate its
# behaviour so we shouldn't guess and just return the original widget
if original.renderer is not django.forms.widgets.RadioFieldRenderer:
return original
create_new_widget = _create_widget(
floppyforms.widgets.RadioSelect,
('choices', 'allow_multiple_selected',))
return create_new_widget(original)
def _create_splitdatetimewidget(widget_class):
def create_new_widget(original):
new_widget = widget_class(
attrs=original.attrs,
date_format=original.widgets[0].format,
time_format=original.widgets[1].format)
_copy_attributes(original, new_widget, _WIDGET_COMMON_ARGUMENTS)
return new_widget
return create_new_widget
def _create_multiwidget(widget_class, copy_attributes=(), init_arguments=()):
create_new_widget = _create_widget(widget_class, copy_attributes,
init_arguments)
def create_new_multiwidget(original):
multiwidget = create_new_widget(original)
multiwidget.widgets = [
floppify_widget(widget)
for widget in multiwidget.widgets]
return multiwidget
return create_new_multiwidget
# this dictionary keeps a mapping from django's widget classes to a callable
# that will accept an instance of this class. It will return a new instance of
# a corresponding floppyforms widget, with the same semantics -- all relevant
# attributes will be copied to the new widget.
_django_to_floppyforms_widget = {
django.forms.widgets.Input:
_create_widget(floppyforms.widgets.Input, ('input_type',)),
django.forms.widgets.TextInput:
_create_widget(floppyforms.widgets.TextInput, ('input_type',)),
django.forms.widgets.PasswordInput:
_create_widget(floppyforms.widgets.PasswordInput, ('input_type',)),
django.forms.widgets.HiddenInput:
_create_widget(floppyforms.widgets.HiddenInput, ('input_type',)),
django.forms.widgets.MultipleHiddenInput:
_create_widget(
floppyforms.widgets.MultipleHiddenInput,
('input_type',),
init_arguments=('choices',)),
django.forms.widgets.FileInput:
_create_widget(floppyforms.widgets.FileInput, ('input_type',)),
django.forms.widgets.ClearableFileInput:
_create_widget(
floppyforms.widgets.ClearableFileInput,
(
'input_type', 'initial_text', 'input_text',
'clear_checkbox_label', 'template_with_initial',
'template_with_clear')),
django.forms.widgets.Textarea:
_create_widget(floppyforms.widgets.Textarea),
django.forms.widgets.DateInput:
_create_widget(
floppyforms.widgets.DateInput,
init_arguments=('format',)),
django.forms.widgets.DateTimeInput:
_create_widget(
floppyforms.widgets.DateTimeInput,
init_arguments=('format',)),
django.forms.widgets.TimeInput:
_create_widget(
floppyforms.widgets.TimeInput,
init_arguments=('format',)),
django.forms.widgets.CheckboxInput:
_create_widget(floppyforms.widgets.CheckboxInput, ('check_test',)),
django.forms.widgets.Select:
_create_widget(
floppyforms.widgets.Select,
('choices', 'allow_multiple_selected',)),
django.forms.widgets.NullBooleanSelect:
_create_widget(
floppyforms.widgets.NullBooleanSelect,
('choices', 'allow_multiple_selected',)),
django.forms.widgets.SelectMultiple:
_create_widget(
floppyforms.widgets.SelectMultiple,
('choices', 'allow_multiple_selected',)),
django.forms.widgets.RadioSelect:
_create_radioselect,
django.forms.widgets.CheckboxSelectMultiple:
_create_widget(
floppyforms.widgets.CheckboxSelectMultiple,
('choices', 'allow_multiple_selected',)),
django.forms.widgets.MultiWidget:
_create_widget(
floppyforms.widgets.MultiWidget,
init_arguments=('widgets',)),
django.forms.widgets.SplitDateTimeWidget:
_create_splitdatetimewidget(
floppyforms.widgets.SplitDateTimeWidget),
django.forms.widgets.SplitHiddenDateTimeWidget:
_create_splitdatetimewidget(
floppyforms.widgets.SplitHiddenDateTimeWidget),
django.forms.extras.widgets.SelectDateWidget:
_create_widget(
floppyforms.widgets.SelectDateWidget,
init_arguments=('years',) if django.VERSION >= (1, 7) else ('years', 'required')),
}
_django_field_to_floppyform_widget = {
django.forms.fields.FloatField:
_create_widget(floppyforms.widgets.NumberInput),
django.forms.fields.DecimalField:
_create_widget(floppyforms.widgets.NumberInput),
django.forms.fields.IntegerField:
_create_widget(floppyforms.widgets.NumberInput),
django.forms.fields.EmailField:
_create_widget(floppyforms.widgets.EmailInput),
django.forms.fields.URLField:
_create_widget(floppyforms.widgets.URLInput),
django.forms.fields.SlugField:
_create_widget(floppyforms.widgets.SlugInput),
django.forms.fields.GenericIPAddressField:
_create_widget(floppyforms.widgets.TextInput),
django.forms.fields.SplitDateTimeField:
_create_splitdatetimewidget(floppyforms.widgets.SplitDateTimeWidget),
}
def allow_floppify_widget_for_field(field):
'''
We only allow to replace a widget with the floppyform counterpart if the
original, by django determined widget is still in place. We don't want to
override custom widgets that a user specified.
'''
# There is a special case for IntegerFields (and all subclasses) that
# replaces the default TextInput with a NumberInput, if localization is
# turned off. That applies for Django 1.6 upwards.
# See the relevant source code in django:
# https://github.com/django/django/blob/1.9.6/django/forms/fields.py#L261-264
if isinstance(field, django.forms.IntegerField) and not field.localize:
if field.widget.__class__ is django.forms.NumberInput:
return True
# We can check if the widget was replaced by comparing the class of the
# specified widget with the default widget that is specified on the field
# class.
if field.widget.__class__ is field.__class__.widget:
return True
# At that point we are assuming that the user replaced the original widget
# with a custom one. So we don't allow to overwrite it.
return False
def floppify_widget(widget, field=None):
'''
Get an instance of django.forms.widgets.Widget and return a new widget
instance but using the corresponding floppyforms widget class.
Only original django widgets will be replaced with a floppyforms version.
The widget will be returned unaltered if it is not known, e.g. if it's a
custom widget from a third-party app.
The optional parameter ``field`` can be used to influence the widget
creation further. This is useful since floppyforms supports more widgets
than django does. For example is django using a ``TextInput`` for a
``EmailField``, but floppyforms has a better suiting widget called
``EmailInput``. If a widget is found specifically for the passed in
``field``, it will take precendence to the first parameter ``widget``
which will effectively be ignored.
'''
if field is not None:
create_widget = _django_field_to_floppyform_widget.get(
field.__class__)
if create_widget is not None:
if allow_floppify_widget_for_field(field):
return create_widget(widget)
create_widget = _django_to_floppyforms_widget.get(widget.__class__)
if create_widget is not None:
return create_widget(widget)
return widget
def floppify_form(form_class):
'''
Take a normal form and return a subclass of that form that replaces all
django widgets with the corresponding floppyforms widgets.
'''
new_form_class = type(form_class.__name__, (form_class,), {})
for field in new_form_class.base_fields.values():
field.widget = floppify_widget(field.widget, field=field)
return new_form_class
def modelform_factory(model, form=django.forms.models.ModelForm, fields=None,
exclude=None, formfield_callback=None, widgets=None):
form_class = django.forms.models.modelform_factory(
model=model,
form=form,
fields=fields,
exclude=exclude,
formfield_callback=formfield_callback,
widgets=widgets)
return floppify_form(form_class)

View file

@ -1,28 +1,38 @@
from django.conf.urls import patterns, include, url
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module
"""
WARNING: This file about to undergo major refactoring by @pydanny per
Issue #99.
"""
from importlib import import_module
from django.conf import settings
from django.urls import re_path
from django.core.exceptions import ImproperlyConfigured
from . import apiviews
from . import models
from . import types
from . import utils
from . import views
class Admin2(object):
class Admin2:
"""
The base Admin2 object.
It keeps a registry of all registered Models and collects the urls of their
related ModelAdmin2 instances.
It also provides an index view that serves as an entry point to the admin site.
It also provides an index view that serves as an entry point to the
admin site.
"""
index_view = views.IndexView
login_view = views.LoginView
app_index_view = views.AppIndexView
api_index_view = apiviews.IndexAPIView
def __init__(self, name='admin2'):
def __init__(self, name="admin2"):
self.registry = {}
self.apps = {}
self.app_verbose_names = {}
self.name = name
def register(self, model, model_admin=None, **kwargs):
@ -36,17 +46,17 @@ class Admin2(object):
instantiation.
If a model is already registered, this will raise ImproperlyConfigured.
"""
if model in self.registry:
raise ImproperlyConfigured('%s is already registered in django-admin2' % model)
raise ImproperlyConfigured(
"%s is already registered in django-admin2" % model
)
if not model_admin:
model_admin = models.ModelAdmin2
model_admin = types.ModelAdmin2
self.registry[model] = model_admin(model, admin=self, **kwargs)
# Add the model to the apps registry
app_label = model._meta.app_label
app_label = utils.model_options(model).app_label
if app_label in self.apps.keys():
self.apps[app_label][model] = self.registry[model]
else:
@ -56,16 +66,19 @@ class Admin2(object):
"""
Deregisters the given model. Remove the model from the self.app as well
If the model is not already registered, this will raise ImproperlyConfigured.
If the model is not already registered, this will raise
ImproperlyConfigured.
"""
try:
del self.registry[model]
except KeyError:
raise ImproperlyConfigured('%s was never registered in django-admin2' % model)
raise ImproperlyConfigured(
"%s was never registered in django-admin2" % model
)
# Remove the model from the apps registry
# Get the app label
app_label = model._meta.app_label
app_label = utils.model_options(model).app_label
# Delete the model from it's app registry
del self.apps[app_label][model]
@ -74,49 +87,125 @@ class Admin2(object):
if self.apps[app_label] is {}:
del self.apps[app_label] # no
def register_app_verbose_name(self, app_label, app_verbose_name):
"""
Registers the given app label with the given app verbose name.
If a app_label is already registered, this will raise
ImproperlyConfigured.
"""
if app_label in self.app_verbose_names:
raise ImproperlyConfigured(
"%s is already registered in django-admin2" % app_label
)
self.app_verbose_names[app_label] = app_verbose_name
def deregister_app_verbose_name(self, app_label):
"""
Deregisters the given app label. Remove the app label from the
self.app_verbose_names as well.
If the app label is not already registered, this will raise
ImproperlyConfigured.
"""
try:
del self.app_verbose_names[app_label]
except KeyError:
raise ImproperlyConfigured(
"%s app label was never registered in django-admin2" % app_label
)
def autodiscover(self):
"""
Autodiscovers all admin2.py modules for apps in INSTALLED_APPS by
trying to import them.
"""
apps = []
for app_name in [x for x in settings.INSTALLED_APPS]:
try:
import_module("%s.admin2" % app_name)
except ImportError as e:
if str(e) == "No module named admin2":
if str(e).startswith("No module named") and "admin2" in str(e):
continue
raise e
def get_admin_by_name(self, name):
"""
Returns the admin instance that was registered with the passed in
name.
"""
for object_admin in self.registry.values():
if object_admin.name == name:
return object_admin
raise ValueError("No object admin found with name {}".format(repr(name)))
def get_index_kwargs(self):
return {
'registry': self.registry,
'apps': self.apps,
"registry": self.registry,
"app_verbose_names": self.app_verbose_names,
"apps": self.apps,
"login_view": self.login_view,
}
def get_app_index_kwargs(self):
return {
"registry": self.registry,
"app_verbose_names": self.app_verbose_names,
"apps": self.apps,
}
def get_api_index_kwargs(self):
return {
'registry': self.registry,
'apps': self.apps,
"registry": self.registry,
"app_verbose_names": self.app_verbose_names,
"apps": self.apps,
}
def get_urls(self):
urlpatterns = patterns('',
url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='dashboard'),
url(r'^api/v0/$',
self.api_index_view.as_view(**self.get_api_index_kwargs()), name='api-index'),
)
for model, model_admin in self.registry.iteritems():
urlpatterns += patterns('',
url('^{}/{}/'.format(
model._meta.app_label,
model._meta.object_name.lower()),
include(model_admin.urls)),
url('^api/v0/{}/{}/'.format(
model._meta.app_label,
model._meta.object_name.lower()),
include(model_admin.api_urls)),
)
urlpatterns = [
re_path(
r"^$",
view=self.index_view.as_view(**self.get_index_kwargs()),
name="dashboard",
),
re_path(
r"^auth/user/(?P<pk>\d+)/update/password/$",
view=views.PasswordChangeView.as_view(),
name="password_change",
),
re_path(
"^password_change_done/$",
view=views.PasswordChangeDoneView.as_view(),
name="password_change_done",
),
re_path("^logout/$", view=views.LogoutView.as_view(), name="logout"),
re_path(
r"^(?P<app_label>\w+)/$",
view=self.app_index_view.as_view(**self.get_app_index_kwargs()),
name="app_index",
),
re_path(
r"^api/v0/$",
view=self.api_index_view.as_view(**self.get_api_index_kwargs()),
name="api_index",
),
]
for model, model_admin in self.registry.items():
model_options = utils.model_options(model)
urlpatterns += [
re_path(
"^{}/{}/".format(
model_options.app_label, model_options.object_name.lower()
),
model_admin.urls,
),
re_path(
"^api/v0/{}/{}/".format(
model_options.app_label, model_options.object_name.lower()
),
model_admin.api_urls,
),
]
return urlpatterns
@property

139
djadmin2/filters.py Normal file
View file

@ -0,0 +1,139 @@
import collections.abc
from itertools import chain
import django_filters
from django import forms
from django.forms import widgets as django_widgets
from django.forms.utils import flatatt
from django.utils.encoding import force_str
from django.utils.html import format_html
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy
from .utils import type_str
LINK_TEMPLATE = '<a href=?{0}={1} {2}>{3}</a>'
class NumericDateFilter(django_filters.DateFilter):
field_class = forms.IntegerField
class ChoicesAsLinksWidget(django_widgets.Select):
"""Select form widget that renders links for choices
instead of select element with options.
"""
def render(self, name, value, attrs=None, choices=()):
links = []
for choice_value, choice_label in chain(self.choices, choices):
links.append(format_html(
LINK_TEMPLATE,
name, choice_value, flatatt(attrs), force_str(choice_label),
))
return mark_safe(u"<br />".join(links))
class NullBooleanLinksWidget(
ChoicesAsLinksWidget,
django_widgets.NullBooleanSelect
):
def __init__(self, attrs=None, choices=()):
super(ChoicesAsLinksWidget, self).__init__(attrs)
self.choices = [
('1', gettext_lazy('Unknown')),
('2', gettext_lazy('Yes')),
('3', gettext_lazy('No')),
]
#: Maps `django_filter`'s field filters types to our
#: custom form widget.
FILTER_TYPE_TO_WIDGET = {
django_filters.BooleanFilter: NullBooleanLinksWidget,
django_filters.ChoiceFilter: ChoicesAsLinksWidget,
django_filters.ModelChoiceFilter: ChoicesAsLinksWidget,
}
def build_list_filter(request, model_admin, queryset):
"""Builds :class:`~django_filters.FilterSet` instance
for :attr:`djadmin2.ModelAdmin2.Meta.list_filter` option.
If :attr:`djadmin2.ModelAdmin2.Meta.list_filter` is not
sequence, it's considered to be class with interface like
:class:`django_filters.FilterSet` and its instantiate wit
`request.GET` and `queryset`.
"""
# if ``list_filter`` is not iterable return it right away
if not isinstance(model_admin.list_filter, collections.abc.Iterable):
return model_admin.list_filter(
request.GET,
queryset=queryset,
)
# otherwise build :mod:`django_filters.FilterSet`
filters = []
for field_filter in model_admin.list_filter:
if isinstance(field_filter, str):
filters.append(get_filter_for_field_name(
queryset.model,
field_filter,
))
else:
filters.append(field_filter)
filterset_dict = {}
for field_filter in filters:
filterset_dict[field_filter.field_name] = field_filter
fields = list(filterset_dict.keys())
filterset_dict['Meta'] = type(
type_str('Meta'),
(),
{
'model': queryset.model,
'fields': fields,
},
)
return type(type_str('%sFilterSet' % queryset.model.__name__), (django_filters.FilterSet, ), filterset_dict,)(request.GET, queryset=queryset)
def build_date_filter(request, model_admin, queryset, field_name="published_date"):
filterset_dict = {
"year": NumericDateFilter(
field_name=field_name,
lookup_expr="year",
),
"month": NumericDateFilter(
field_name=field_name,
lookup_expr="month",
),
"day": NumericDateFilter(
field_name=field_name,
lookup_expr="day",
)
}
filterset_dict["Meta"] = type(
type_str('Meta'),
(object, ),
{"model": queryset.model, "fields": [field_name]},
)
return type(
type_str('%sDateFilterSet' % queryset.model.__name__),
(django_filters.FilterSet,),
filterset_dict,
)(request.GET, queryset=queryset)
def get_filter_for_field_name(model, field_name):
"""Returns filter for model field by field name.
"""
filter_ = django_filters.FilterSet.filter_for_field(
django_filters.filterset.get_model_field(model, field_name,),
field_name,
)
print("EXTRA!!!!")
print(filter_.extra)
filter_.widget = FILTER_TYPE_TO_WIDGET.get(
filter_.__class__
)
return filter_

View file

@ -1,7 +1,66 @@
from django import forms
from django.contrib.auth import authenticate
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth.forms import UserCreationForm, UserChangeForm
from django.core.exceptions import ValidationError
from django.urls import reverse_lazy
from django.utils.translation import gettext_lazy as _
class Admin2Form(forms.ModelForm):
# Translators : %(username)s will be replaced by the username_field name
# (default : username, but could be email, or something else)
ERROR_MESSAGE = _(
"Please enter the correct %(username)s and password "
"for a staff account. Note that both fields may be case-sensitive."
)
class AdminAuthenticationForm(AuthenticationForm):
"""
A custom authentication form used in the admin app.
Liberally copied from django.contrib.admin.forms.AdminAuthenticationForm
"""
error_messages = {
'required': _("Please log in again, because your session has expired."),
}
this_is_the_login_form = forms.BooleanField(
widget=forms.HiddenInput,
initial=1,
error_messages=error_messages
)
def clean(self):
username = self.cleaned_data.get('username')
password = self.cleaned_data.get('password')
message = ERROR_MESSAGE
if username and password:
self.user_cache = authenticate(username=username, password=password)
if self.user_cache is None:
raise ValidationError(message % {
'username': self.username_field.verbose_name
})
elif not self.user_cache.is_active or not self.user_cache.is_staff:
raise ValidationError(message % {
'username': self.username_field.verbose_name
})
return self.cleaned_data
class Admin2UserCreationForm(UserCreationForm):
pass
class Admin2UserChangeForm(UserChangeForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
print(self.fields['password'].help_text)
self.fields['password'].help_text = _("Raw passwords are not stored, so there is no way to see this user's password, but you can change the password using <a href=\"%s\">this form</a>." % self.get_update_password_url())
def get_update_password_url(self):
if self.instance and self.instance.pk:
return reverse_lazy('admin2:password_change', args=[self.instance.pk])
return 'password/'

Binary file not shown.

View file

@ -0,0 +1,295 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# amarsahinovic, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-07 21:32+0000\n"
"Last-Translator: amarsahinovic\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/django-admin2/"
"language/bs/)\n"
"Language: bs\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Stavke moraju biti odabrane da bi se nad njima izvodile akcije. Nijedna "
"stavka nije promijenjena."
#: actions.py:149
msgid "Delete selected items"
msgstr "Izbrišite odabrane stavke"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Uspješno izbrisano %(count)s %(items)s"
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Uspješno izbrisano %(count)s %(items)s"
#: filters.py:40
msgid "Unknown"
msgstr "Nepoznato"
#: filters.py:41
msgid "Yes"
msgstr "Da"
#: filters.py:42
msgid "No"
msgstr "Ne"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Molimo unesite ispravno %(username)s i lozinku za račun osoblja. Imajte na "
"umu da oba polja mogu sadržavati velika i mala slova."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Molimo prijavite se ponovo, vaša sesija je istekla."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Promijeni"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Dodaj"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Početna"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s administracija"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Administracija stranice"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Dokumentacija"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Prijavljen kao %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Promijeni lozinku"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Odjavi se"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Nedavne akcije"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Moje akcije"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Da li ste sigurni?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Izbriši"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Da li ste sigurni da želite obrisati %(model_name)s \"%(object)s\"?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"Sve navedene stavke će biti obrisane:\n"
msgstr[1] ""
"\n"
"Sve navedene stavke će biti obrisane:\n"
msgstr[2] ""
"\n"
"Sve navedene stavke će biti obrisane:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Da, siguran sam"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Odaberite %(model_name)s za izmjenu"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Pojam za pretragu"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Traži"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Da li ste sigurni da želite obrisati odabrani %(objects_name)s? Sve navedene "
"stavke će biti obrisane:\n"
msgstr[1] ""
"\n"
"Da li ste sigurni da želite obrisati odabrane %(objects_name)s? Sve navedene "
"stavke će biti obrisane:\n"
msgstr[2] ""
"\n"
"Da li ste sigurni da želite obrisati odabrane %(objects_name)s? Sve navedene "
"stavke će biti obrisane:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Prijavi se"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Molimo ispravite dole navedenu grešku."
msgstr[1] "Molimo ispravite dole navedene greške."
msgstr[2] "Molimo ispravite dole navedene greške."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Hvala što ste proveli kvalitetno vrijeme na stranici danas."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Prijavite se ponovo"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Promjena lozinke uspješna"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Vaša lozinka je promijenjena."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Promjena lozinke"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Molimo unesite vašu staru lozinku, iz sigurnosnih razloga, a zatim unesite "
"Vašu novu lozinku dva puta da bi mogli biti sigurni da ste je unijeli "
"ispravno."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Promijeni moju lozinku"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s od %(total)s ukupno"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Dodaj %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Sačuvaj i dodaj još jedan"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Sačuvaj i nastavi sa izmjenama"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Sačuvaj"

Binary file not shown.

View file

@ -0,0 +1,266 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Ignasi Fosch Alonso <natx@y10k.ws>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-06 14:47+0200\n"
"Last-Translator: Ignasi Fosch Alonso <natx@y10k.ws>\n"
"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/"
"ca/\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
#: actions.py:149
msgid "Delete selected items"
msgstr ""
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: filters.py:40
msgid "Unknown"
msgstr ""
#: filters.py:41
msgid "Yes"
msgstr ""
#: filters.py:42
msgid "No"
msgstr ""
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr ""
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr ""
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr ""
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr ""
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr ""
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr ""

Binary file not shown.

View file

@ -0,0 +1,289 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# a7p <albrecht@a7p.org>, 2013
# dbrgn <gezuru@gmail.com>, 2013
# Jannis Leidel <jannis@leidel.info>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-08 08:45+0000\n"
"Last-Translator: dbrgn <gezuru@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/django-admin2/"
"language/de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Damit Aktionen ausgeführt werden können, müssen Einträge markiert werden. Es "
"wurden keine Einträge verändert."
#: actions.py:149
msgid "Delete selected items"
msgstr "Ausgewählte Einträge löschen"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Erfolgreich %(count)s %(items)s gelöscht."
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Erfolgreich %(count)s %(items)s gelöscht."
#: filters.py:40
msgid "Unknown"
msgstr "Unbekannt"
#: filters.py:41
msgid "Yes"
msgstr "Ja"
#: filters.py:42
msgid "No"
msgstr "Nein"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Bitte geben Sie den korrekten %(username)s und Passwort für einen \"Staff\" "
"Accout ein. Beachten Sie in beiden Feldern Groß-/Kleinschreibung."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Bitte melden Sie sich erneut an, da ihre Sitzung abgelaufen ist."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Ändern"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Hinzufügen"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Home"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s Verwaltung"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Site Verwaltung"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Dokumentation"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Angemeldet als %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Passwort ändern"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Abmelden"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Neuste Aktionen"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Meine Aktionen"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Löschen"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Sind Sie sicher, dass Sie den %(model_name)s-Eintrag \"%(object)s\" löschen "
"möchten?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"Der folgende Eintrag wird gelöscht:\n"
msgstr[1] ""
"\n"
"Folgenden Einträge werden gelöscht:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Ja, ich bin sicher"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Wählen Sie den zu ändernden %(model_name)s Eintrag."
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Suchbegriff"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Suchen"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(model_name)s %(action_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Sind Sie sicher, dass Sie das ausgewählte %(objects_name)s löschen möchten? "
"Die folgenden Einträge werden gelöscht:\n"
msgstr[1] ""
"\n"
"Sind Sie sicher, dass Sie die ausgewählten %(objects_name)s löschen möchten? "
"Die folgenden Einträge werden gelöscht:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Anmelden"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Bitte korrigieren Sie den untenstehenden Fehler."
msgstr[1] "Bitte korrigieren Sie die untenstehenden Fehler."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Vielen Dank, dass Sie hier ein paar nette Minuten verbracht haben."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Erneut einloggen"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Passwort erfolgreich geändert"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Ihr Passwort wurde geändert."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Passwort ändern"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Passwort und darunter "
"dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das "
"neue Passwort ein."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Mein Passwort ändern"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s von %(total)s ausgewählt"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "%(model_verbose_name)s hinzufügen"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Sichern und neu hinzufügen"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Speichern und weiter bearbeiten"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Speichern"

Binary file not shown.

View file

@ -0,0 +1,275 @@
# This file is distributed under the same license as the django-admin2 package.
#
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-06 13:27+0200\n"
"Last-Translator: NotSqrt <notsqrt@gmail.com>\n"
"Language-Team: English (https://www.transifex.com/projects/p/django-admin2/language/en_US/)\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
#: actions.py:149
msgid "Delete selected items"
msgstr "Delete selected items"
#: actions.py:153
#, fuzzy, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Successfully deleted %(count)s %(items)s"
#: actions.py:157
#, fuzzy, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Successfully deleted %(count)s %(items)s"
#: filters.py:40
msgid "Unknown"
msgstr "Unknown"
#: filters.py:41
msgid "Yes"
msgstr "Yes"
#: filters.py:42
msgid "No"
msgstr ""
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Please log in again, because your session has expired."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Change"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Add"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Home"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s administration"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Site administration"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Documentation"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Logged in as %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Change password"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Log out"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Recent Actions"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "My Actions"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Are you sure?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Delete"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, fuzzy, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"Are you sure you want to delete the %(model_name)s \"%(object)s\"? All of "
"the following items will be deleted:"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Yes, I'm sure"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Select %(model_name)s to change"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Search Term"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Search"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, fuzzy, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, fuzzy, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
"following items will be deleted:"
msgstr[1] ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
"following items will be deleted:"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Log in"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Please correct the error below."
msgstr[1] "Please correct the errors below."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Thanks for spending some quality time with the Web site today."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Log in again"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Password change successful"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Your password was changed."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Password change"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Change my password"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s of %(total)s selected"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Add %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Save and add another"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Save and continue editing"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Save"

Binary file not shown.

View file

@ -0,0 +1,266 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Danilo Bargen <gezuru@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-06 14:47+0200\n"
"Last-Translator: Danilo Bargen <gezuru@gmail.com>\n"
"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/"
"es/\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
#: actions.py:149
msgid "Delete selected items"
msgstr ""
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: filters.py:40
msgid "Unknown"
msgstr ""
#: filters.py:41
msgid "Yes"
msgstr ""
#: filters.py:42
msgid "No"
msgstr ""
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr ""
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr ""
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr ""
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr ""
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr ""
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr ""

Binary file not shown.

View file

@ -0,0 +1,286 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# NotSqrt <notsqrt@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-06 13:27+0200\n"
"Last-Translator: NotSqrt <notsqrt@gmail.com>\n"
"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/"
"fr/\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Des éléments doivent être sélectionnés afin d'appliquer les actions. Aucun "
"élément n'a été modifié."
#: actions.py:149
msgid "Delete selected items"
msgstr "Supprimer les objets sélectionnés"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s a été supprimé avec succès."
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s ont été supprimés avec succès."
#: filters.py:40
msgid "Unknown"
msgstr "Inconnu"
#: filters.py:41
msgid "Yes"
msgstr "Oui"
#: filters.py:42
msgid "No"
msgstr "Non"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Veuillez compléter correctement les champs « %(username)s » et « mot de "
"passe » d'un compte autorisé. Sachez que les deux champs peuvent être "
"sensibles à la casse."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Reconnectez-vous car votre session a expiré."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Modifier"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Ajouter"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Accueil"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "Administration de %(app_label)s"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Administration du site"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Documentation"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Connecté en tant que %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Modifier votre mot de passe"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Déconnexion"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Actions récentes"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Mes actions"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Supprimer"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Voulez-vous vraiment supprimer l'objet %(model_name)s « %(object)s » ?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"L'élément suivant sera supprimé :\n"
msgstr[1] ""
"\n"
"Les éléments suivants seront supprimés :\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Oui, je suis sûr"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Sélectionnez l'objet %(model_name)s à modifier"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Terme à rechercher"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Recherche"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Voulez-vous vraiment supprimer l'objet %(objects_name)s sélectionné ? "
"L'élément suivant sera supprimé :\n"
msgstr[1] ""
"\n"
"Voulez-vous vraiment supprimer les objets %(objects_name)s sélectionnés ? "
"Les éléments suivants seront supprimés :\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Connexion"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Corrigez l'erreur suivante."
msgstr[1] "Corrigez les erreurs suivantes."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Merci pour le temps que vous avez accordé à ce site aujourd'hui."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Connectez-vous à nouveau"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Mot de passe modifié avec succès"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Votre mot de passe a été modifié."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Modification de votre mot de passe"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Pour des raisons de sécurité, saisissez votre ancien mot de passe puis votre "
"nouveau mot de passe à deux reprises afin de vérifier qu'il est correctement "
"saisi."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Modifier mon mot de passe"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s sur %(total)s sélectionnés"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Ajouter %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Enregistrer et ajouter un nouveau"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Enregistrer et continuer les modifications"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Enregistrer"

Binary file not shown.

View file

@ -0,0 +1,266 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Margherita Zamponi <margherita.zamponi@gmail.com>
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-06 14:47+0200\n"
"Last-Translator: Margherita Zamponi <margherita.zamponi@gmail.com>\n"
"Language-Team: https://www.transifex.com/projects/p/django-admin2/language/"
"it/\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
#: actions.py:149
msgid "Delete selected items"
msgstr ""
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr ""
#: filters.py:40
msgid "Unknown"
msgstr ""
#: filters.py:41
msgid "Yes"
msgstr ""
#: filters.py:42
msgid "No"
msgstr ""
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr ""
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr ""
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr ""
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr ""
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr ""
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr ""
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr ""
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr ""
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr ""
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr ""
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr ""
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr ""

Binary file not shown.

View file

@ -0,0 +1,288 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# Density21.5 <jasper@plainspace.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-08 10:54+0000\n"
"Last-Translator: Density21.5 <jasper@plainspace.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/django-admin2/"
"language/nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Om acties uit kunnen voeren moeten er onderdelen geselecteerd zijn. Er zijn "
"geen onderdelen gewijzigd."
#: actions.py:149
msgid "Delete selected items"
msgstr "Verwijder geselecteerde onderdelen"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s succesvol verwijderd"
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s succesvol verwijderd"
#: filters.py:40
msgid "Unknown"
msgstr "Onbekend"
#: filters.py:41
msgid "Yes"
msgstr "Ja"
#: filters.py:42
msgid "No"
msgstr "Nee"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Voer alstublieft een correcte %(username)s en wachtwoord combinatie met "
"beheer privileges in. Let er op dat beide velden hoofdletter-gevoelig zijn."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Uw sessie is verlopen, logt u alstublieft opnieuw in."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Wijzigen"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Toevoegen"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Home"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s beheer"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Site beheer"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Documentatie"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Ingelogd als %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Wijzig wachtwoord"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Uitloggen"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Recente acties"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Mijn acties"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Weet u het zeker?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Verwijderen"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Weet u zeker dat u %(model_name)s \"%(object)s\" wilt verwijderen?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"Het volgende onderdeel zal verwijderd worden:\n"
msgstr[1] ""
"\n"
"De volgende onderdelen zullen verwijderd worden:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Ja, Ik weet het zeker"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Selecteer te wijzigen %(model_name)s"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Zoekterm"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Zoek"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(model_name)s %(action_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Weet u zeker dat u geselecteerd \"%(objects_name)s\" wilt verwijderen? De "
"volgende onderdelen zullen allemaal verwijderd worden:\n"
msgstr[1] ""
"\n"
"Weet u zeker dat u geselecteerde \"%(objects_name)s\" wilt verwijderen? De "
"volgende onderdelen zullen allemaal verwijderd worden:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Inloggen"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Corrigeert u alstublieft de onderstaande fout."
msgstr[1] "Corrigeert u alstublieft de onderstaande fouten"
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
"Hartelijk dank voor het doorbrengen van enige momenten van uw waardevolle "
"tijd met de website."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Opnieuw inloggen"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Wachtwoord succesvol gewijzigd"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Uw wachtwoord is gewijzigd"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Wachtwoord wijzigen"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Voert u alstublieft, om veiligheidsredenen, uw oude wachtwoord in en voer "
"vervolgens uw nieuwe wachtwoord tweemaal in om te verifiëren dat u het "
"wachtwoord correct intypt."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Wijzig mijn wachtwoord"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s van %(total)s geselecteerd"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Voeg %(model_verbose_name)s toe"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Opslaan en een nieuwe toevoegen"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Opslaan en doorgaan met wijzigen"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Opslaan"

Binary file not shown.

View file

@ -0,0 +1,297 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# dasm <smigiel.dariusz@gmail.com>, 2013
# Marcin Jabrzyk <marcin.jabrzyk@gmail.com>, 2013
# Marcin Jabrzyk <marcin.jabrzyk@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-08 17:49+0000\n"
"Last-Translator: dasm <smigiel.dariusz@gmail.com>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/django-"
"admin2/language/pl_PL/)\n"
"Language: pl_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"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Wykonanie akcji wymaga wybrania elementów. Żaden element nie został "
"zmieniony."
#: actions.py:149
msgid "Delete selected items"
msgstr "Usuń wybrane obiekty"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Pomyślnie usunięto %(count)s %(items)s"
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Pomyślnie usunięto %(count)s %(items)s"
#: filters.py:40
msgid "Unknown"
msgstr "Nieznany"
#: filters.py:41
msgid "Yes"
msgstr "Tak"
#: filters.py:42
msgid "No"
msgstr "Nie"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Proszę wprowadzić poprawne %(username)s i hasło do konta administratora. "
"Należy pamiętać, że oba pola mogą rozróżniać wielkość wprowadzonych znaków."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Proszę zalogować się ponownie, ponieważ twoja sesja wygasła."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Zmień"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Dodaj"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Początek"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s - administracja"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Administracja stroną"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Dokumentacja"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Zalogowano jako %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Zmień hasło"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Wyloguj się"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Ostatnie akcje"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Moje akcje"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Jesteś pewien?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Usuń"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Czy chcesz skasować %(model_name)s \"%(object)s\"?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"Następujące element zostanie skasowany:\n"
msgstr[1] ""
"\n"
"Następujące elementy zostaną skasowane:\n"
msgstr[2] ""
"\n"
"Następujące elementy zostaną skasowane:\n"
"\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Tak, na pewno"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Wybierz %(model_name)s aby zmienić"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Poszukiwane wyrażenie"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Szukaj"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Czy chcesz skasować wybrany %(objects_name)s? Następujący obiekt zostanie "
"usunięty:\n"
msgstr[1] ""
"\n"
"Czy chcesz skasować wybrane %(objects_name)s? Następujące obiekty zostaną "
"usunięte:\n"
msgstr[2] ""
"\n"
"Czy chcesz skasować wybrane %(objects_name)s? Następujące elementy zostaną "
"usunięte:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Zaloguj się"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Proszę, popraw poniższy błąd."
msgstr[1] "Proszę, popraw poniższe błędy."
msgstr[2] "Proszę popraw poniższe błędy."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Dziękujemy za czas spędzony na tej stronie."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Zaloguj się ponownie"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Hasło zostało pomyślnie zmienione"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Twoje hasło zostało zmienione."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Zmiana hasła"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"W celach bezpieczeństwa podaj swoje stare hasło oraz wprowadź dwukrotnie "
"nowe hasło, by można było zweryfikować jego poprawność."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Zmień moje hasło"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s z %(total)s wybranych"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Dodaj %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Zapisz i dodaj nowe"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Zapisz i kontynuuj edycję"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Zapisz"

Binary file not shown.

View file

@ -0,0 +1,287 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# andrewsmedina <andrewsmedina@gmail.com>, 2013
# Douglas Miranda <douglasmirandasilva@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-09 05:03+0000\n"
"Last-Translator: Douglas Miranda <douglasmirandasilva@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"django-admin2/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: actions.py:29
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 que foram alterados."
#: actions.py:149
msgid "Delete selected items"
msgstr "Remover itens selecionados"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s removidos com sucesso"
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "%(count)s %(items)s removidos com sucesso"
#: filters.py:40
msgid "Unknown"
msgstr "Desconhecido"
#: filters.py:41
msgid "Yes"
msgstr "Sim"
#: filters.py:42
msgid "No"
msgstr "Não"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Por favor digite o %(username)s e senha corretos para uma conta pessoal. "
"Note-se que ambos os campos podem diferenciar maiúsculas de minúsculas."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Por favor autentique-se novamente, porque sua sessão expirou."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Alterar"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Adicionar"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Página inicial"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s administração"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Administração"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Documentação"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Autenticado como %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Alterar senha"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Sair"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Ações Recentes"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Minhas Ações"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Você está certo?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Remover"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Você está certo em querer remover os %(model_name)s \"%(object)s\"?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"O item seguinte será removido:\n"
msgstr[1] ""
"\n"
"Todos os itens seguintes serão removidos:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Sim, eu estou certo"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Selecione %(model_name)s para alterar"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Buscar Termo"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Buscar"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Você está certo em querer remover o %(objects_name)s selecionado? Todos os "
"itens seguintes serão removidos:\n"
msgstr[1] ""
"\n"
"Você está certo em querer remover os %(objects_name)s selecionados? Todo os "
"itens seguintes serão removidos:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Autentique-se"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Por favor corrija o erro abaixo."
msgstr[1] "Por favor, corrija os erros abaixo."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Obrigado por passar algum tempo com o site hoje."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Autentique-se novamente"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Senha alterada com sucesso"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Sua senha foi alterada."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Alterar senha"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Por favor, digite sua senha antiga, por questões de segurança, e, em "
"seguida, digite a nova senha duas vezes, para que possamos verificar se você "
"digitou corretamente."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Alterar minha senha"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "%(selected)s de %(total)s selecionados"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Adicionar %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Salvar e adicionar outro"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Salvar e continuar editando"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Salvar"

Binary file not shown.

View file

@ -0,0 +1,293 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Ivana Kellyerova <eruraina@gmail.com>, 2013
# marekzelinka <mzelinka@myopera.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-07 18:39+0000\n"
"Last-Translator: marekzelinka <mzelinka@myopera.com>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/django-admin2/"
"language/sk/)\n"
"Language: sk\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>=2 && n<=4) ? 1 : 2;\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Nevybrali ste položky, ktoré chcete zmeniť. Žiadne položky neboli zmenené."
#: actions.py:149
msgid "Delete selected items"
msgstr "Odstrániť označené položky"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Úspešne vymazaných %(count)s %(items)s"
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "Úspešne vymazaných %(count)s %(items)s"
#: filters.py:40
msgid "Unknown"
msgstr "Neznámy"
#: filters.py:41
msgid "Yes"
msgstr "Áno"
#: filters.py:42
msgid "No"
msgstr "Nie"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr ""
"Prosím, vyplňte správne položku %(username)s a heslo správcovského účtu. "
"Zoberte do úvahy, že v oboch prípadoch sa môžu rozlišovať veľké a malé "
"písmená."
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "Vaše prihlásenie vypršalo. Prihláste sa, prosím, znova."
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "Zmeniť"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "Pridať"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "Domov"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s administrácia"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "Administrácia stránky"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "Dokumentácia"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "Prihlásený/-á ako %(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "Zmeniť heslo"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "Odhlásiť sa"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "Posledné zmeny"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "Moje zmeny"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "Určite?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "Odstrániť"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"Určite chcete vymazať %(model_name)s \"%(object)s\"?\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"Nasledujúca položka bude vymazaná:\n"
msgstr[1] ""
"\n"
"Nasledujúce položky budú vymazané:\n"
msgstr[2] ""
"\n"
"Nasledujúce položky budú vymazané:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "Áno, určite"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "Vyberte %(model_name)s na zmenu"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "Vyhľadávaný výraz"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "Hľadať"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] ""
"\n"
"Určite chcete vymazať zvolený %(objects_name)s? Odstránite tak všetky "
"nasledovné položky:\n"
msgstr[1] ""
"\n"
"Určite chcete vymazať zvolené %(objects_name)s? Odstránite tak všetky "
"nasledovné položky:\n"
msgstr[2] ""
"\n"
"Určite chcete vymazať zvolené %(objects_name)s? Odstránite tak všetky "
"nasledujúce položky:\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "Prihlásiť sa"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Prosím, opravte chybu nižšie."
msgstr[1] "Prosím, opravte chyby nižšie."
msgstr[2] "Prosím, opravte chyby nižšie."
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "Vďaka za čas strávený na tejto stránke."
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "Znova sa prihlásiť"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "Zmena hesla úspešná"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "Vaše heslo bolo zmenené."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "Zmena hesla"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"Z bezpečnostných dôvodov zadajte, prosím, vaše staré heslo a potom nové "
"heslo dvakrát, aby sa dalo overiť, že ste sa nepomýlili."
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "Zmeniť moje heslo"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "Vybraných %(selected)s z %(total)s"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "Pridať %(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "Uložiť a pridať ďalšie"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "Uložiť a pokračovať v úpravách"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "Uložiť"

Binary file not shown.

View file

@ -0,0 +1,271 @@
# This file is distributed under the same license as the django-admin2 package.
#
# Translators:
# Translators:
# EricHo <eric913@gmail.com>, 2013
# introom <i@introo.me>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django-admin2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-09 11:57+0200\n"
"PO-Revision-Date: 2013-07-08 07:10+0000\n"
"Last-Translator: introom <i@introo.me>\n"
"Language-Team: Chinese (http://www.transifex.com/projects/p/django-admin2/"
"language/zh/)\n"
"Language: zh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: actions.py:29
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr "请选择项目以进行后续操作。当前没有修改的项目。"
#: actions.py:149
msgid "Delete selected items"
msgstr "删除所选择的项目"
#: actions.py:153
#, python-format
msgctxt "singular form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "已成功地刪除%(count)s %(items)s "
#: actions.py:157
#, python-format
msgctxt "plural form"
msgid "Successfully deleted %(count)s %(items)s"
msgstr "已成功地刪除%(count)s %(items)s "
#: filters.py:40
msgid "Unknown"
msgstr "未知"
#: filters.py:41
msgid "Yes"
msgstr "是"
#: filters.py:42
msgid "No"
msgstr "否"
#. Translators : %(username)s will be replaced by the username_field name
#. (default : username, but could be email, or something else)
#: forms.py:242
#, python-format
msgid ""
"Please enter the correct %(username)s and password for a staff account. Note "
"that both fields may be case-sensitive."
msgstr "请输入正确的%(username)s和密码。注意大小写。"
#: forms.py:253
msgid "Please log in again, because your session has expired."
msgstr "由于您的会话已经过期,请重新登录。"
#: views.py:228 templates/djadmin2/bootstrap/model_update_form.html:35
#: templates/djadmin2/bootstrap/includes/app_model_list.html:38
msgid "Change"
msgstr "修改"
#: views.py:249 templates/djadmin2/bootstrap/includes/app_model_list.html:30
msgid "Add"
msgstr "增加"
#: templates/djadmin2/bootstrap/app_index.html:6
#: templates/djadmin2/bootstrap/base.html:56
#: templates/djadmin2/bootstrap/model_confirm_delete.html:10
#: templates/djadmin2/bootstrap/model_detail.html:11
#: templates/djadmin2/bootstrap/model_list.html:14
#: templates/djadmin2/bootstrap/model_update_form.html:17
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:10
#: templates/djadmin2/bootstrap/auth/logout.html:8
#: templates/djadmin2/bootstrap/auth/password_change_done.html:11
#: templates/djadmin2/bootstrap/auth/password_change_form.html:10
msgid "Home"
msgstr "首页"
#: templates/djadmin2/bootstrap/app_index.html:12
#, python-format
msgid "%(app_label)s administration"
msgstr "%(app_label)s 管理"
#: templates/djadmin2/bootstrap/base.html:6
#: templates/djadmin2/bootstrap/base.html:72
#: templates/djadmin2/bootstrap/auth/login.html:15
msgid "Site administration"
msgstr "站点管理"
#: templates/djadmin2/bootstrap/base.html:23
msgid "API"
msgstr "API"
#: templates/djadmin2/bootstrap/base.html:26
msgid "Documentation"
msgstr "文档"
#: templates/djadmin2/bootstrap/base.html:35
#, python-format
msgid "Logged in as %(user)s"
msgstr "登入用户:%(user)s"
#: templates/djadmin2/bootstrap/base.html:41
msgid "Change password"
msgstr "修改密码"
#: templates/djadmin2/bootstrap/base.html:43
#: templates/djadmin2/bootstrap/auth/logout.html:11
msgid "Log out"
msgstr "登出"
#: templates/djadmin2/bootstrap/index.html:13
msgid "Recent Actions"
msgstr "最近的动作"
#: templates/djadmin2/bootstrap/index.html:14
msgid "My Actions"
msgstr "我的动作"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:4
#: templates/djadmin2/bootstrap/model_confirm_delete.html:6
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:4
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:6
msgid "Are you sure?"
msgstr "您确定吗?"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:25
#: templates/djadmin2/bootstrap/model_update_form.html:51
#: templates/djadmin2/bootstrap/model_update_form.html:118
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:21
msgid "Delete"
msgstr "删除"
#. Translators : this is singular, example : delete the post "My Title"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:32
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the %(model_name)s \"%(object)s\"?\n"
msgstr ""
"\n"
"您确定要删除 %(model_name)s \"%(object)s\"吗?所有以下项目将会被删除:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:36
msgid ""
"\n"
"The following item will be deleted:\n"
msgid_plural ""
"\n"
"All of the following items will be deleted:\n"
msgstr[0] ""
"\n"
"以下所有項目將被刪除:\n"
#: templates/djadmin2/bootstrap/model_confirm_delete.html:50
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr "是,我确定"
#: templates/djadmin2/bootstrap/model_list.html:4
#: templates/djadmin2/bootstrap/model_list.html:6
#, python-format
msgid "Select %(model_name)s to change"
msgstr "选择修改 %(model_name)s"
#: templates/djadmin2/bootstrap/model_list.html:31
msgid "Search Term"
msgstr "搜索条目"
#: templates/djadmin2/bootstrap/model_list.html:32
msgid "Search"
msgstr "搜索"
#. Translators : examples : Add post, Change object
#: templates/djadmin2/bootstrap/model_update_form.html:6
#: templates/djadmin2/bootstrap/model_update_form.html:9
#, python-format
msgid "%(action_name)s %(model_name)s"
msgstr "%(action_name)s %(model_name)s"
#: templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html:27
#, python-format
msgid ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"item will be deleted:\n"
msgid_plural ""
"\n"
"Are you sure you want to delete the selected %(objects_name)s? The following "
"items will be deleted:\n"
msgstr[0] "\n您确定要删除所选择的%(objects_name)s吗以下所有项目都将被删除\n"
#: templates/djadmin2/bootstrap/auth/login.html:15
#: templates/djadmin2/bootstrap/auth/login.html:52
msgid "Log in"
msgstr "登入"
#: templates/djadmin2/bootstrap/auth/login.html:27
#: templates/djadmin2/bootstrap/auth/password_change_form.html:24
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "请更正以下错误。"
#: templates/djadmin2/bootstrap/auth/logout.html:17
msgid "Thanks for spending some quality time with the Web site today."
msgstr "感谢您访问本网站。"
#: templates/djadmin2/bootstrap/auth/logout.html:18
msgid "Log in again"
msgstr "重新登入"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:6
#: templates/djadmin2/bootstrap/auth/password_change_done.html:7
#: templates/djadmin2/bootstrap/auth/password_change_done.html:14
msgid "Password change successful"
msgstr "密码已成功被修改"
#: templates/djadmin2/bootstrap/auth/password_change_done.html:20
msgid "Your password was changed."
msgstr "您的密码已被修改"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:6
#: templates/djadmin2/bootstrap/auth/password_change_form.html:13
msgid "Password change"
msgstr "修改密码"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:20
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
"出于安全因素,请您输入旧密码。然后再输入两次新密码以便我们确保您正确地输入了"
"新密码。"
#: templates/djadmin2/bootstrap/auth/password_change_form.html:31
msgid "Change my password"
msgstr "修改我的密码"
#: templates/djadmin2/bootstrap/includes/list_actions.html:17
#, python-format
msgid "%(selected)s of %(total)s selected"
msgstr "共选择了%(selected)s/%(total)s"
#: templates/djadmin2/bootstrap/includes/list_actions.html:21
#, python-format
msgid "Add %(model_verbose_name)s"
msgstr "增加%(model_verbose_name)s"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:3
msgid "Save and add another"
msgstr "保存并且增加下一个"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:4
msgid "Save and continue editing"
msgstr "保存并且继续编辑"
#: templates/djadmin2/bootstrap/includes/save_buttons.html:5
msgid "Save"
msgstr "保存"

View file

@ -0,0 +1,39 @@
from django.db import migrations, models
from django.conf import settings
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('contenttypes', '0002_remove_content_type_name'),
]
operations = [
migrations.CreateModel(
name='LogEntry',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('action_time', models.DateTimeField(verbose_name='action time', auto_now=True)),
('object_id', models.TextField(verbose_name='object id', null=True, blank=True)),
('object_repr', models.CharField(max_length=200, verbose_name='object repr')),
('action_flag', models.PositiveSmallIntegerField(verbose_name='action flag')),
('change_message', models.TextField(verbose_name='change message', blank=True)),
('content_type', models.ForeignKey(
related_name='log_entries',
null=True,
blank=True,
to='contenttypes.ContentType',
on_delete=models.CASCADE)),
('user', models.ForeignKey(
related_name='log_entries',
to=settings.AUTH_USER_MODEL,
on_delete=models.CASCADE)),
],
options={
'verbose_name': 'log entry',
'ordering': ('-action_time',),
'verbose_name_plural': 'log entries',
},
),
]

View file

@ -1,287 +1,95 @@
"""
""" Boilerplate for now, will serve a purpose soon! """
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.utils.encoding import force_str
from django.utils.translation import gettext, gettext_lazy as _
For wont of a better name, this module is called 'models'. It's role is
synonymous with the django.contrib.admin.sites model.
"""
from django.core.urlresolvers import reverse
from django.conf.urls import patterns, url
from django.contrib.auth import models as auth_app
from django.db.models import get_models, signals
from djadmin2 import apiviews
from djadmin2 import views
try:
import floppyforms as forms
except ImportError:
from django import forms
from .utils import quote
class BaseAdmin2(object):
"""
Warning: This class will likely merged with ModelAdmin2
"""
class LogEntryManager(models.Manager):
def log_action(self, user_id, obj, action_flag, change_message=''):
content_type_id = ContentType.objects.get_for_model(obj).id
e = self.model(None, None, user_id, content_type_id,
force_str(obj.id), force_str(obj)[:200],
action_flag, change_message)
e.save()
search_fields = []
# Show the fields to be displayed as columns
# TODO: Confirm that this is what the Django admin uses
list_fields = []
class LogEntry(models.Model):
ADDITION = 1
CHANGE = 2
DELETION = 3
#This shows up on the DocumentListView of the Posts
list_actions = []
action_time = models.DateTimeField(_('action time'), auto_now=True)
user = models.ForeignKey(settings.AUTH_USER_MODEL,
related_name='log_entries',
on_delete=models.CASCADE)
content_type = models.ForeignKey(ContentType, blank=True, null=True,
related_name='log_entries',
on_delete=models.CASCADE)
object_id = models.TextField(_('object id'), blank=True, null=True)
object_repr = models.CharField(_('object repr'), max_length=200)
action_flag = models.PositiveSmallIntegerField(_('action flag'))
change_message = models.TextField(_('change message'), blank=True)
# This shows up in the DocumentDetailView of the Posts.
document_actions = []
objects = LogEntryManager()
# shows up on a particular field
field_actions = {}
class Meta:
verbose_name = _('log entry')
verbose_name_plural = _('log entries')
ordering = ('-action_time',)
fields = None
exclude = None
fieldsets = None
form_class = None
filter_vertical = ()
filter_horizontal = ()
radio_fields = {}
prepopulated_fields = {}
formfield_overrides = {}
readonly_fields = ()
ordering = None
def __repr__(self):
return force_str(self.action_time)
def __init__(self, model, admin):
super(BaseAdmin2, self).__init__()
self.model = model
self.admin = admin
def __str__(self):
if self.action_flag == self.ADDITION:
return gettext('Added "%(object)s".') % {
'object': self.object_repr}
elif self.action_flag == self.CHANGE:
return gettext('Changed "%(object)s" - %(changes)s') % {
'object': self.object_repr,
'changes': self.change_message,
}
elif self.action_flag == self.DELETION:
return gettext('Deleted "%(object)s."') % {
'object': self.object_repr}
def _user_has_permission(self, user, permission_type, obj=None):
""" Generic method for checking whether the user has permission of specified type for the model.
Type can be one of view, add, change, delete.
You can also specify instance of the model for object-specific permission check.
return gettext('LogEntry Object')
def is_addition(self):
return self.action_flag == self.ADDITION
def is_change(self):
return self.action_flag == self.CHANGE
def is_deletion(self):
return self.action_flag == self.DELETION
@property
def action_type(self):
if self.is_addition():
return _('added')
if self.is_change():
return _('changed')
if self.is_deletion():
return _('deleted')
return ''
def get_edited_object(self):
"Returns the edited object represented by this log entry"
return self.content_type.get_object_for_this_type(pk=self.object_id)
def get_admin_url(self):
"""
if not user.is_authenticated() or not user.is_staff:
return False
opts = self.model._meta
full_permission_name = '%s.%s_%s' % (opts.app_label, permission_type, opts.object_name.lower())
return user.has_perm(full_permission_name, obj)
def has_permission(self, request, permission_type, obj=None):
return self._user_has_permission(request.user, permission_type, obj)
def has_view_permission(self, request, obj=None):
""" Can view this object """
return self.has_permission(request, 'view', obj)
def has_edit_permission(self, request, obj=None):
""" Can edit this object """
return self.has_permission(request, 'change', obj)
def has_add_permission(self, request, obj=None):
""" Can add this object """
return self.has_permission(request, 'add', obj)
def has_delete_permission(self, request, obj=None):
""" Can delete this object """
return self.has_permission(request, 'delete', obj)
class ModelAdmin2(BaseAdmin2):
"""
Warning: This class is targeted for reduction.
It's bloated and ugly.
"""
list_display = ('__str__',)
list_display_links = ()
list_filter = ()
list_select_related = False
list_per_page = 100
list_max_show_all = 200
list_editable = ()
search_fields = ()
save_as = False
save_on_top = False
verbose_name = None
verbose_name_plural = None
create_form_class = None
update_form_class = None
# Views
index_view = views.ModelListView
create_view = views.ModelAddFormView
update_view = views.ModelEditFormView
detail_view = views.ModelDetailView
delete_view = views.ModelDeleteView
# API configuration
api_serializer_class = None
# API Views
api_list_view = apiviews.ListCreateAPIView
api_detail_view = apiviews.RetrieveUpdateDestroyAPIView
def __init__(self, model, admin, **kwargs):
self.model = model
self.admin = admin
self.app_label = model._meta.app_label
self.model_name = model._meta.object_name.lower()
if self.verbose_name is None:
self.verbose_name = self.model._meta.verbose_name
if self.verbose_name_plural is None:
self.verbose_name_plural = self.model._meta.verbose_name_plural
def get_default_view_kwargs(self):
return {
'app_label': self.app_label,
'model': self.model,
'model_name': self.model_name,
'model_admin': self,
}
def get_default_api_view_kwargs(self):
kwargs = self.get_default_view_kwargs()
kwargs.update({
'serializer_class': self.api_serializer_class,
})
return kwargs
def get_prefixed_view_name(self, view_name):
return '{}_{}_{}'.format(self.app_label, self.model_name, view_name)
def get_index_kwargs(self):
return self.get_default_view_kwargs()
def get_create_kwargs(self):
kwargs = self.get_default_view_kwargs()
kwargs.update({
'form_class': self.create_form_class if self.create_form_class else self.form_class,
})
return kwargs
def get_update_kwargs(self):
kwargs = self.get_default_view_kwargs()
kwargs.update({
'form_class': self.update_form_class if self.update_form_class else self.form_class,
})
return kwargs
def get_detail_kwargs(self):
return self.get_default_view_kwargs()
def get_delete_kwargs(self):
return self.get_default_view_kwargs()
def get_index_url(self):
return reverse('admin2:{}'.format(self.get_prefixed_view_name('index')))
def get_api_list_kwargs(self):
kwargs = self.get_default_api_view_kwargs()
kwargs.update({
'paginate_by': self.list_per_page,
})
return kwargs
def get_api_detail_kwargs(self):
return self.get_default_api_view_kwargs()
def get_urls(self):
return patterns('',
url(
regex=r'^$',
view=self.index_view.as_view(**self.get_index_kwargs()),
name=self.get_prefixed_view_name('index')
),
url(
regex=r'^create/$',
view=self.create_view.as_view(**self.get_create_kwargs()),
name=self.get_prefixed_view_name('create')
),
url(
regex=r'^(?P<pk>[0-9]+)/$',
view=self.detail_view.as_view(**self.get_detail_kwargs()),
name=self.get_prefixed_view_name('detail')
),
url(
regex=r'^(?P<pk>[0-9]+)/update/$',
view=self.update_view.as_view(**self.get_update_kwargs()),
name=self.get_prefixed_view_name('update')
),
url(
regex=r'^(?P<pk>[0-9]+)/delete/$',
view=self.delete_view.as_view(**self.get_delete_kwargs()),
name=self.get_prefixed_view_name('delete')
),
)
def get_api_urls(self):
return patterns('',
url(
regex=r'^$',
view=self.api_list_view.as_view(**self.get_api_list_kwargs()),
name=self.get_prefixed_view_name('api-list'),
),
url(
regex=r'^(?P<pk>[0-9]+)/$',
view=self.api_detail_view.as_view(**self.get_api_detail_kwargs()),
name=self.get_prefixed_view_name('api-detail'),
),
)
@property
def urls(self):
# We set the application and instance namespace here
return self.get_urls(), None, None
@property
def api_urls(self):
return self.get_api_urls(), None, None
def create_extra_permissions(app, created_models, verbosity, **kwargs):
"""
Creates 'view' permissions for all models.
django.contrib.auth only creates add, change and delete permissions. Since we also support read-only views, we need
to add our own extra permission.
Copied from django.contrib.auth.management.create_permissions
"""
from django.contrib.contenttypes.models import ContentType
app_models = get_models(app)
# This will hold the permissions we're looking for as
# (content_type, (codename, name))
searched_perms = list()
# The codenames and ctypes that should exist.
ctypes = set()
for klass in app_models:
ctype = ContentType.objects.get_for_model(klass)
ctypes.add(ctype)
opts = klass._meta
perm = ('view_%s' % opts.object_name.lower(), u'Can view %s' % opts.verbose_name_raw)
searched_perms.append((ctype, perm))
# Find all the Permissions that have a content_type for a model we're
# looking for. We don't need to check for codenames since we already have
# a list of the ones we're going to create.
all_perms = set(auth_app.Permission.objects.filter(
content_type__in=ctypes,
).values_list(
"content_type", "codename"
))
perms = [
auth_app.Permission(codename=codename, name=name, content_type=ctype)
for ctype, (codename, name) in searched_perms
if (ctype.pk, codename) not in all_perms
]
auth_app.Permission.objects.bulk_create(perms)
if verbosity >= 2:
for perm in perms:
print "Adding permission '%s'" % perm
signals.post_syncdb.connect(create_extra_permissions,
dispatch_uid = "django-admin2.djadmin2.models.create_extra_permissions")
Returns the admin URL to edit the object represented by this log entry.
This is relative to the Django admin index page.
"""
if self.content_type and self.object_id:
return '{0.app_label}/{0.model}/{1}'.format(
self.content_type,
quote(self.object_id)
)
return None

434
djadmin2/permissions.py Normal file
View file

@ -0,0 +1,434 @@
"""
djadmin2's permission handling. The permission classes have the same API as
the permission handling classes of the django-rest-framework. That way, we can
reuse them in the admin's REST API.
The permission checks take place in callables that follow the following
interface:
* They get passed in the current ``request``, an instance of the currently
active ``view`` and optionally the object that should be used for
object-level permission checking.
* Return ``True`` if the permission shall be granted, ``False`` otherwise.
The permission classes are then just fancy wrappers of these basic checks of
which it can hold multiple.
"""
import logging
import re
from django.contrib.auth import get_permission_codename
from django.db.utils import DEFAULT_DB_ALIAS
from django.apps import apps
from django.core.exceptions import ValidationError
from django.db import router
from django.utils.encoding import force_str
logger = logging.getLogger('djadmin2')
def is_authenticated(request, view, obj=None):
'''
Checks if the current user is authenticated.
'''
return request.user.is_authenticated
def is_staff(request, view, obj=None):
'''
Checks if the current user is a staff member.
'''
return request.user.is_staff
def is_superuser(request, view, obj=None):
'''
Checks if the current user is a superuser.
'''
return request.user.is_superuser
def model_permission(permission):
'''
This is actually a permission check factory. It means that it will return
a function that can then act as a permission check. The returned callable
will check if the user has the with ``permission`` provided model
permission. You can use ``{app_label}`` and ``{model_name}`` as
placeholders in the permission name. They will be replaced with the
``app_label`` and the ``model_name`` (in lowercase) of the model that the
current view is operating on.
Example:
.. code-block:: python
check_add_perm = model_permission('{app_label}.add_{model_name}')
class ModelAddPermission(permissions.BasePermission):
permissions = [check_add_perm]
'''
def has_permission(request, view, obj=None):
model_class = getattr(view, 'model', None)
queryset = getattr(view, 'queryset', None)
if model_class is None and queryset is not None:
model_class = queryset.model
assert model_class, (
'Cannot apply model permissions on a view that does not '
'have a `.model` or `.queryset` property.')
try:
# django 1.8+
model_name = model_class._meta.model_name
except AttributeError:
model_name = model_class._meta.module_name
permission_name = permission.format(
app_label=model_class._meta.app_label,
model_name=model_name)
return request.user.has_perm(permission_name, obj)
return has_permission
class BasePermission:
'''
Provides a base class with a common API. It implements a compatible
interface to django-rest-framework permission backends.
'''
permissions = []
permissions_for_method = {}
def get_permission_checks(self, request, view):
permission_checks = []
permission_checks.extend(self.permissions)
method_permissions = self.permissions_for_method.get(request.method, ())
permission_checks.extend(method_permissions)
return permission_checks
# needs to be compatible to django-rest-framework
def has_permission(self, request, view, obj=None):
if request.user:
for permission_check in self.get_permission_checks(request, view):
if not permission_check(request, view, obj):
return False
return True
return False
# needs to be compatible to django-rest-framework
def has_object_permission(self, request, view, obj):
return self.has_permission(request, view, obj)
class IsStaffPermission(BasePermission):
'''
It ensures that the user is authenticated and is a staff member.
'''
permissions = (
is_authenticated,
is_staff)
class IsSuperuserPermission(BasePermission):
'''
It ensures that the user is authenticated and is a superuser. However it
does not check if the user is a staff member.
'''
permissions = (
is_authenticated,
is_superuser)
# TODO: needs documentation
# TODO: needs integration into the REST API
class ModelPermission(BasePermission):
'''
Checks if the necessary model permissions are set for the accessed object.
'''
# Map methods into required permission codes.
# Override this if you need to also provide 'view' permissions,
# or if you want to provide custom permission checks.
permissions_for_method = {
'GET': (),
'OPTIONS': (),
'HEAD': (),
'POST': (model_permission('{app_label}.add_{model_name}'),),
'PUT': (model_permission('{app_label}.change_{model_name}'),),
'PATCH': (model_permission('{app_label}.change_{model_name}'),),
'DELETE': (model_permission('{app_label}.delete_{model_name}'),),
}
class ModelViewPermission(BasePermission):
'''
Checks if the user has the ``<app>.view_<model>`` permission.
'''
permissions = (model_permission('{app_label}.view_{model_name}'),)
class ModelAddPermission(BasePermission):
'''
Checks if the user has the ``<app>.add_<model>`` permission.
'''
permissions = (model_permission('{app_label}.add_{model_name}'),)
class ModelChangePermission(BasePermission):
'''
Checks if the user has the ``<app>.change_<model>`` permission.
'''
permissions = (model_permission('{app_label}.change_{model_name}'),)
class ModelDeletePermission(BasePermission):
'''
Checks if the user has the ``<app>.delete_<model>`` permission.
'''
permissions = (model_permission('{app_label}.delete_{model_name}'),)
class TemplatePermissionChecker:
'''
Can be used in the template like:
.. code-block:: html+django
{{ permissions.has_view_permission }}
{{ permissions.has_add_permission }}
{{ permissions.has_change_permission }}
{{ permissions.has_delete_permission }}
{{ permissions.blog_post.has_view_permission }}
{{ permissions.blog_comment.has_add_permission }}
So in general:
.. code-block:: html+django
{{ permissions.has_<view_name>_permission }}
{{ permissions.<object admin name>.has_<view name>_permission }}
And using object-level permissions:
.. code-block:: html+django
{% load admin2_tags %}
{{ permissions.has_delete_permission|for_object:object }}
{% with permissions|for_object:object as object_permissions %}
{{ object_permissions.has_delete_permission }}
{% endwith %}
And dynamically checking the permissions on a different admin:
.. code-block:: html+django
{% load admin2_tags %}
{% for admin in list_of_model_admins %}
{% with permissions|for_admin:admin as permissions %}
{{ permissions.has_delete_permission }}
{% endwith %}
{% endfor %}
If you don't know the permission you want to check at compile time (e.g.
you cannot put ``has_add_permission`` in the template because the exact
permission name might be passed into the context dynamically) you can bind
the view name with the ``for_view`` filter:
.. code-block:: html+django
{% load admin2_tags %}
{% with "add" as view_name %}
{% if permissions|for_view:view_name %}
<a href="...">{{ view_name|capfirst }} model</a>
{% endif %}
{% endwith %}
The attribute access of ``has_<view name>_permission`` will check for the
permissions of the view on the currently bound model admin not with the
name ``<view name>``, but with the name that the ``view_name_mapping``
returns for it. That step is needed since ``add`` is not the real
attribute name in which the ``ModelAddFormView`` on the model admin lives.
In the future we might get rid of that and this will also make it possible
to check for any view assigned to the admin, like
``{{ permissions.auth_user.has_change_password_permission }}``. But this
needs an interface beeing implemented like suggested in:
https://github.com/twoscoops/django-admin2/issues/142
'''
_has_named_permission_regex = re.compile('^has_(?P<name>\\w+)_permission$')
view_name_mapping = {
'view': 'detail_view',
'add': 'create_view',
'change': 'update_view',
'delete': 'delete_view',
}
def __init__(self, request, model_admin, view=None, obj=None):
self._request = request
self._model_admin = model_admin
self._view = view
self._obj = obj
def clone(self):
return self.__class__(
request=self._request,
model_admin=self._model_admin,
view=self._view,
obj=self._obj)
def bind_admin(self, admin):
'''
Return a clone of the permission wrapper with a new model_admin bind
to it.
'''
if isinstance(admin, str):
try:
admin = self._model_admin.admin.get_admin_by_name(admin)
except ValueError:
return ''
new_permissions = self.clone()
new_permissions._view = None
new_permissions._model_admin = admin
return new_permissions
def bind_view(self, view):
'''
Return a clone of the permission wrapper with a new view bind to it.
'''
if isinstance(view, str):
if view not in self.view_name_mapping:
return ''
view_name = self.view_name_mapping[view]
view = getattr(self._model_admin, view_name).view
# we don't support binding view classes yet, only the name of views
# are processed. We have the problem with view classes that we cannot
# tell which model admin it was attached to.
else:
return ''
# if view is a class and not instantiated yet, do it!
if isinstance(view, type):
view = view(
request=self._request,
**self._model_admin.get_default_view_kwargs())
new_permissions = self.clone()
new_permissions._view = view
return new_permissions
def bind_object(self, obj):
'''
Return a clone of the permission wrapper with a new object bind
to it for object-level permissions.
'''
new_permissions = self.clone()
new_permissions._obj = obj
return new_permissions
#########################################
# interface exposed to the template users
def __getitem__(self, key):
match = self._has_named_permission_regex.match(key)
if match:
# the key was a has_*_permission, so bind the correspodning view
view_name = match.groupdict()['name']
return self.bind_view(view_name)
# the name might be a named object admin. So get that one and bind it
# to the permission checking
try:
admin_site = self._model_admin.admin
model_admin = admin_site.get_admin_by_name(key)
except ValueError:
raise KeyError
return self.bind_admin(model_admin)
def __nonzero__(self):
# if no view is bound we will return false, since we don't know which
# permission to check we stay save in disallowing the access
return self._cast_bool()
def __bool__(self):
return self._cast_bool()
def _cast_bool(self):
if self._view is None:
return False
if self._obj is None:
return self._view.has_permission()
else:
return self._view.has_permission(self._obj)
def __str__(self):
if self._view is None:
return ''
return force_str(bool(self))
def create_view_permissions(app_config, verbosity=2, interactive=True, using=DEFAULT_DB_ALIAS, **kwargs): # noqa
"""
Create 'view' permissions for all models.
``django.contrib.auth`` only creates add, change and delete permissions.
Since we want to support read-only views, we need to add our own
permission.
Copied from ``https://github.com/django/django/blob/1.9.6/django/contrib/auth/management/__init__.py#L60``.
"""
if not app_config.models_module:
return
try:
Permission = apps.get_model('auth', 'Permission')
except LookupError:
return
if not router.allow_migrate_model(using, Permission):
return
from django.contrib.contenttypes.models import ContentType
# This will hold the permissions we're looking for as
# (content_type, (codename, name))
searched_perms = list()
# The codenames and ctypes that should exist.
ctypes = set()
for klass in app_config.get_models():
# Force looking up the content types in the current database
# before creating foreign keys to them.
ctype = ContentType.objects.db_manager(using).get_for_model(klass)
ctypes.add(ctype)
perm = (get_permission_codename('view', klass._meta), 'Can view %s' % (klass._meta.verbose_name_raw))
searched_perms.append((ctype, perm))
# Find all the Permissions that have a content_type for a model we're
# looking for. We don't need to check for codenames since we already have
# a list of the ones we're going to create.
all_perms = set(Permission.objects.using(using).filter(
content_type__in=ctypes,
).values_list(
"content_type", "codename"
))
perms = [
Permission(codename=codename, name=name, content_type=ct)
for ct, (codename, name) in searched_perms
if (ct.pk, codename) not in all_perms
]
# Validate the permissions before bulk_creation to avoid cryptic
# database error when the verbose_name is longer than 50 characters
permission_name_max_length = Permission._meta.get_field('name').max_length
verbose_name_max_length = permission_name_max_length - 11 # len('Can change ') prefix
for perm in perms:
if len(perm.name) > permission_name_max_length:
raise ValidationError(
"The verbose_name of %s.%s is longer than %s characters" % (
perm.content_type.app_label,
perm.content_type.model,
verbose_name_max_length,
)
)
Permission.objects.using(using).bulk_create(perms)
if verbosity >= 2:
for perm in perms:
print("Adding permission '%s'" % perm)

81
djadmin2/renderers.py Normal file
View file

@ -0,0 +1,81 @@
"""
There are currently a few renderers that come directly with django-admin2. They
are used by default for some field types.
"""
import os.path
from datetime import date, time, datetime
from django.db import models
from django.template.loader import render_to_string
from django.utils import formats, timezone
from django.utils.encoding import force_str
from djadmin2 import settings
def boolean_renderer(value, field):
"""
Render a boolean value as icon.
This uses the template ``renderers/boolean.html``.
:param value: The value to process.
:type value: boolean
:param field: The model field instance
:type field: django.db.models.fields.Field
:rtype: unicode
"""
# TODO caching of template
tpl = os.path.join(settings.ADMIN2_THEME_DIRECTORY, 'renderers/boolean.html')
return render_to_string(tpl, {'value': value})
def datetime_renderer(value, field):
"""
Localize and format the specified date.
:param value: The value to process.
:type value: datetime.date or datetime.time or datetime.datetime
:param field: The model field instance
:type field: django.db.models.fields.Field
:rtype: unicode
"""
if isinstance(value, datetime):
# django ticket #23466 Removing seconds from locale formats
return formats.localize(timezone.template_localtime(value))
elif isinstance(value, (date, time)):
return ":".join((formats.localize(value)).split(":")[:2])
else:
return ":".join(value.split(":")[:2])
def title_renderer(value, field):
"""
Render a string in title case (capitalize every word).
:param value: The value to process.
:type value: str or unicode
:param field: The model field instance
:type field: django.db.models.fields.Field
:rtype: unicode or str
"""
return force_str(value).title()
def number_renderer(value, field):
"""
Format a number.
:param value: The value to process.
:type value: float or long
:param field: The model field instance
:type field: django.db.models.fields.Field
:rtype: unicode
"""
if isinstance(field, models.DecimalField):
return formats.number_format(value, field.decimal_places)
return formats.number_format(value)

15
djadmin2/settings.py Normal file
View file

@ -0,0 +1,15 @@
from django.conf import settings
# Restricts the attributes that are passed from ModelAdmin2 classes to their
# views. This is a security feature.
# See the docstring on djadmin2.types.ModelAdmin2 for more detail.
MODEL_ADMIN_ATTRS = (
'actions_selection_counter', "date_hierarchy", 'list_display',
'list_display_links', 'list_filter', 'admin', 'search_fields',
'field_renderers', 'index_view', 'detail_view', 'create_view',
'update_view', 'delete_view', 'get_default_view_kwargs',
'get_list_actions', 'get_ordering', 'actions_on_bottom', 'actions_on_top',
'ordering', 'save_on_top', 'save_on_bottom', 'readonly_fields', )
ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "djadmin2theme_bootstrap3")

3
djadmin2/site.py Normal file
View file

@ -0,0 +1,3 @@
from . import core
djadmin2_site = core.Admin2()

View file

@ -1,23 +0,0 @@
/* Fixes a Bootstrap 2.3 bug. This can be removed when upgrading to Bootstrap v3. */
.text-right
{
text-align: right !important;
}
.text-center
{
text-align: center !important;
}
.text-left
{
text-align: left !important;
}
.checkbox-column {
width: 16px;
}
.space-below {
margin-bottom: 10px;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

View file

@ -1,35 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>django-admin2</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap-custom.css" rel="stylesheet" media="screen">
</head>
<body>
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="brand" href="{% url 'admin2:dashboard' %}">Django-Admin2</a>
<ul class="nav pull-right">
<li><a href="{% url 'admin2:api-index' %}">API</a></li>
<li><a href="TODO">Log out</a></li>
</ul>
</div>
</div>
</div>
<div class="container-fluid">
{% block content %}{% endblock %}
</div>
<script src="http://code.jquery.com/jquery.js"></script>
<script src="{{ STATIC_URL }}themes/bootstrap/js/bootstrap.min.js"></script>
{% block extrajs %}{% endblock %}
</body>
</html>

View file

@ -1,53 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% load admin2_urls %}
{% block content %}
<h3>Site administration</h3>
<div class="row">
<div class="span7">
{% for app, registry in apps.items %}
<table class="table table-bordered table-condensed">
<thead>
<tr>
<th colspan="3">
<a href="TODO {{ app.get_index_url }}">{{ app|title }}</a>
</th>
</tr>
</thead>
<tbody>
{% for model_class, model_admin in registry.items %}
<tr>
<td width="40%">
<a href="{{ model_admin.get_index_url }}">
{{ model_admin.verbose_name_plural|title }}
</a>
</td>
<td class="text-right">
{# if has_add_permission #}
<a href="{% url model_admin|admin2_urlname:'create' %}">
<i class="icon-plus"></i>
Add
</a>
{# endif #}
</td>
<td class="text-right">
<a href="{{ model_admin.get_index_url }}">
<i class="icon-pencil"></i>
Change
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endfor %}
</div>
<div class="span5">
<h4>Recent Actions</h4>
<h5>My Actions</h5>
TODO
</div>
</div>
{% endblock content %}

View file

@ -1,11 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% block content %}
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit"/>
</form>
{% endblock content %}

View file

@ -1,12 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% block content %}
<form method="post">
{% csrf_token %}
delete {{ object }}
{{ form.as_p }}
<input type="submit"/>
</form>
{% endblock content %}

View file

@ -1,7 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% block content %}
{{ object }}
{% endblock content %}

View file

@ -1,22 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% block content %}
<div class="row">
<div class="span10">
<h3>Change {{ model }}</h3>
</div>
</div>
<div class="row">
<div class="span12">
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit"/>
</form>
</div>
</div>
{% endblock content %}

View file

@ -1,50 +0,0 @@
{% extends "admin2/bootstrap/base.html" %}
{% load admin2_urls %}
{% block content %}
<div class="row">
<div class="span10">
<h3>Select {{ model }} to change</h3>
</div>
</div>
<div class="row">
<div class="span12">
<div class="space-below">
<div class="btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown">
Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a tabindex="-1" href="#">Delete selected {{ model }}{{ object_list|pluralize }}</a></li>
</ul>
</div>
<small class="muted">TODO of {{ object_list|length }} selected</small>
<div class="pull-right">
{# if has_add_permission #}
<a href="{% url view|admin2_urlname:'create' %}" class="btn"><i class="icon-plus"></i> Add {{ model }}</a>
{# endif #}
</div>
</div>
<table class="table table-bordered table-striped">
<thead>
<th class="checkbox-column"><input type="checkbox"></th>
<th>{{ model|title}}</th>
</thead>
<tbody>
{% for obj in object_list %}
<td><input type="checkbox"></td>
<td>
<a href="{% url view|admin2_urlname:'update' pk=obj.pk %}">{{ obj }}</a>
</td>
{% endfor %}
</tbody>
</table>
<p>{{ object_list|length }} {{ model }}{{ object_list|pluralize }}</p>
</div>
</div>
{% endblock content %}

View file

@ -0,0 +1,151 @@
from numbers import Number
from datetime import date, time, datetime
from django import template
from django.core.exceptions import FieldDoesNotExist
from .. import utils, renderers, models, settings
register = template.Library()
@register.filter
def admin2_urlname(view, action):
"""
Converts the view and the specified action into a valid namespaced URLConf name.
"""
return utils.admin2_urlname(view, action)
@register.filter
def model_app_label(obj):
"""
Returns the app label of a model instance or class.
"""
return utils.model_app_label(obj)
@register.filter
def model_verbose_name(obj):
"""
Returns the verbose name of a model instance or class.
"""
return utils.model_verbose_name(obj)
@register.filter
def model_verbose_name_plural(obj):
"""
Returns the pluralized verbose name of a model instance or class.
"""
return utils.model_verbose_name_plural(obj)
@register.filter
def verbose_name_for(verbose_names, app_label):
"""
Returns the verbose name of an app.
"""
return verbose_names.get(app_label, None)
@register.filter
def model_attr_verbose_name(obj, attr):
"""
Returns the verbose name of a model field or method.
"""
try:
return utils.model_field_verbose_name(obj, attr)
except FieldDoesNotExist:
return utils.model_method_verbose_name(obj, attr)
@register.filter
def formset_visible_fieldlist(formset):
"""
Returns the labels of a formset's visible fields as an array.
"""
return [f.label for f in formset.forms[0].visible_fields()]
@register.filter
def for_admin(permissions, admin):
"""
Only useful in the permission handling. This filter binds a new admin to
the permission handler to allow checking views of an arbitrary admin.
"""
# some permission check has failed earlier, so we don't bother trying to
# bind a new admin to it.
if permissions == '':
return permissions
return permissions.bind_admin(admin)
@register.filter
def for_view(permissions, view):
"""
Only useful in the permission handling. This filter binds a new view to
the permission handler to check for view names that are not known during
template compile time.
"""
# some permission check has failed earlier, so we don't bother trying to
# bind a new admin to it.
if permissions == '':
return permissions
return permissions.bind_view(view)
@register.filter
def for_object(permissions, obj):
"""
Only useful in the permission handling. This filter binds a new object to
the permission handler to check for object-level permissions.
"""
# some permission check has failed earlier, so we don't bother trying to
# bind a new object to it.
if permissions == '':
return permissions
return permissions.bind_object(obj)
@register.simple_tag(takes_context=True)
def render(context, model_instance, attribute_name):
"""
This filter applies all renderers specified in admin2.py to the field.
"""
value = utils.get_attr(model_instance, attribute_name)
# Get renderer
admin = context['view'].model_admin
renderer = admin.field_renderers.get(attribute_name, False)
if renderer is None:
# Renderer has explicitly been overridden
return value
if not renderer:
# Try to automatically pick best renderer
if isinstance(value, bool):
renderer = renderers.boolean_renderer
elif isinstance(value, (date, time, datetime)):
renderer = renderers.datetime_renderer
elif isinstance(value, Number):
renderer = renderers.number_renderer
else:
return value
# Apply renderer and return value
try:
field = model_instance._meta.get_field(attribute_name)
except FieldDoesNotExist:
# There is no field with the specified name.
# It must be a method instead.
field = None
return renderer(value, field)
@register.inclusion_tag(
settings.ADMIN2_THEME_DIRECTORY + '/includes/history.html',
takes_context=True)
def action_history(context):
actions = models.LogEntry.objects.filter(user__pk=context['user'].pk)
return {'actions': actions}

View file

@ -1,12 +0,0 @@
from django import template
register = template.Library()
@register.filter
def admin2_urlname(view, action):
"""
Converts the view and the specified action into a valid namespaced URLConf name.
"""
return 'admin2:%s_%s_%s' % (view.app_label, view.model_name, action)

View file

@ -1,4 +0,0 @@
from test_models import *
from test_utils import *
from test_views import *
from test_core import *

View file

@ -0,0 +1,59 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
]
operations = [
migrations.CreateModel(
name='BigThing',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
],
),
migrations.CreateModel(
name='RendererTestModel',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('decimal', models.DecimalField(max_digits=10, decimal_places=5)),
],
),
migrations.CreateModel(
name='SmallThing',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
],
),
migrations.CreateModel(
name='TagsTestsModel',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('field1', models.CharField(max_length=23)),
('field2', models.CharField(max_length=42, verbose_name='second field')),
],
options={
'verbose_name': 'Tags Test Model',
'verbose_name_plural': 'Tags Test Models',
},
),
migrations.CreateModel(
name='Thing',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
],
),
migrations.CreateModel(
name='UtilsTestModel',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('field1', models.CharField(max_length=23)),
('field2', models.CharField(max_length=42, verbose_name='second field')),
],
options={
'verbose_name': 'Utils Test Model',
'verbose_name_plural': 'Utils Test Models',
},
),
]

View file

50
djadmin2/tests/models.py Normal file
View file

@ -0,0 +1,50 @@
from django.db import models
class Thing(models.Model):
pass
class SmallThing(models.Model):
pass
class BigThing(models.Model):
pass
class TagsTestsModel(models.Model):
field1 = models.CharField(max_length=23)
field2 = models.CharField('second field', max_length=42)
def was_published_recently(self):
return True
was_published_recently.boolean = True
was_published_recently.short_description = 'Published recently?'
class Meta:
verbose_name = "Tags Test Model"
verbose_name_plural = "Tags Test Models"
class RendererTestModel(models.Model):
decimal = models.DecimalField(decimal_places=5, max_digits=10)
class UtilsTestModel(models.Model):
field1 = models.CharField(max_length=23)
field2 = models.CharField('second field', max_length=42)
def simple_method(self):
return 42
def was_published_recently(self):
return True
was_published_recently.boolean = True
was_published_recently.short_description = 'Published recently?'
class Meta:
verbose_name = "Utils Test Model"
verbose_name_plural = "Utils Test Models"

View file

@ -0,0 +1,32 @@
{% extends "djadmin2theme_bootstrap3/base.html" %}
{% load i18n static admin2_tags %}
{% block navbar %}{% endblock navbar %}
{% block breacrumbs %}{% endblock breacrumbs %}
{% block page_header %}{% endblock page_header %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="login-panel panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Custom login view</h3>
</div>
<div class="panel-body">
<form method="post" class="">
{% csrf_token %}
{{ form }}
<input type="hidden" name="this_is_the_login_form" value="1"/>
<input type="hidden" name="next" value="{{ next }}"/>
<button class="btn btn-lg btn-success btn-block" type="submit">
{% trans "Log in" %}
</button>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock content %}

View file

@ -0,0 +1,45 @@
from django.test import TestCase
from ..core import Admin2
from ..actions import get_description
from .models import Thing
class TestAction:
description = "Test Action Class"
def test_function():
pass
class ActionTest(TestCase):
def setUp(self):
self.admin2 = Admin2()
def test_action_description(self):
self.admin2.register(Thing)
self.admin2.registry[Thing].list_actions.extend([
TestAction,
test_function,
])
self.assertEqual(
get_description(
self.admin2.registry[Thing].list_actions[0]
),
'Delete selected items'
)
self.assertEqual(
get_description(
self.admin2.registry[Thing].list_actions[1]
),
'Test Action Class'
)
self.assertEqual(
get_description(
self.admin2.registry[Thing].list_actions[2]
),
'Test function'
)
self.admin2.registry[Thing].list_actions.remove(TestAction)
self.admin2.registry[Thing].list_actions.remove(test_function)

View file

@ -0,0 +1,86 @@
from django import forms
from django.forms.formsets import formset_factory
from django.test import TestCase
from ..templatetags import admin2_tags
from ..views import IndexView
from .models import TagsTestsModel
class TagsTestForm(forms.Form):
visible_1 = forms.CharField()
visible_2 = forms.CharField()
invisible_1 = forms.HiddenInput()
TagsTestFormSet = formset_factory(TagsTestForm)
class TagsTests(TestCase):
def setUp(self):
self.instance = TagsTestsModel()
def test_admin2_urlname(self):
self.assertEqual(
"admin2:None_None_index",
admin2_tags.admin2_urlname(IndexView, "index")
)
def test_model_verbose_name_as_model_class(self):
self.assertEqual(
TagsTestsModel._meta.verbose_name,
admin2_tags.model_verbose_name(TagsTestsModel)
)
def test_model_verbose_name_as_model_instance(self):
self.assertEqual(
self.instance._meta.verbose_name,
admin2_tags.model_verbose_name(self.instance)
)
def test_model_verbose_name_plural_as_model_class(self):
self.assertEqual(
TagsTestsModel._meta.verbose_name_plural,
admin2_tags.model_verbose_name_plural(TagsTestsModel)
)
def test_model_verbose_name_plural_as_model_instance(self):
self.assertEqual(
self.instance._meta.verbose_name_plural,
admin2_tags.model_verbose_name_plural(self.instance)
)
def test_model_field_verbose_name_autogenerated(self):
self.assertEqual(
'field1',
admin2_tags.model_attr_verbose_name(self.instance, 'field1')
)
def test_model_field_verbose_name_overridden(self):
self.assertEqual(
'second field',
admin2_tags.model_attr_verbose_name(self.instance, 'field2')
)
def test_model_method_verbose_name(self):
self.assertEqual(
'Published recently?',
admin2_tags.model_attr_verbose_name(self.instance, 'was_published_recently')
)
def test_formset_visible_fieldlist(self):
formset = TagsTestFormSet()
self.assertEqual(
admin2_tags.formset_visible_fieldlist(formset),
['Visible 1', 'Visible 2']
)
def test_verbose_name_for(self):
app_verbose_names = {
'app_one_label': 'App One Verbose Name',
}
self.assertEqual(
"App One Verbose Name",
admin2_tags.verbose_name_for(app_verbose_names, 'app_one_label')
)

View file

@ -0,0 +1,61 @@
from django import forms
from django.contrib.auth.models import User
from django.test import TestCase
from django.test.client import RequestFactory
from django.urls import reverse
from djadmin2.site import djadmin2_site
from ..admin2 import UserAdmin2
class UserAdminTest(TestCase):
def setUp(self):
self.factory = RequestFactory()
self.user = User(
username='admin',
is_staff=True,
is_superuser=True)
self.user.set_password('admin')
self.user.save()
def test_create_form_uses_floppyform_widgets(self):
form = UserAdmin2.create_form_class()
self.assertTrue(
isinstance(form.fields['username'].widget,
forms.TextInput))
request = self.factory.get(reverse('admin2:auth_user_create'))
request.user = self.user
model_admin = UserAdmin2(User, djadmin2_site)
view = model_admin.create_view.view.as_view(
**model_admin.get_create_kwargs())
response = view(request)
form = response.context_data['form']
self.assertTrue(
isinstance(form.fields['username'].widget,
forms.TextInput))
def test_update_form_uses_floppyform_widgets(self):
form = UserAdmin2.update_form_class()
self.assertTrue(
isinstance(form.fields['username'].widget,
forms.TextInput))
self.assertTrue(
isinstance(form.fields['date_joined'].widget,
forms.DateTimeInput))
request = self.factory.get(
reverse('admin2:auth_user_update', args=(self.user.pk,)))
request.user = self.user
model_admin = UserAdmin2(User, djadmin2_site)
view = model_admin.update_view.view.as_view(
**model_admin.get_update_kwargs())
response = view(request, pk=self.user.pk)
form = response.context_data['form']
self.assertTrue(
isinstance(form.fields['username'].widget,
forms.TextInput))
self.assertTrue(
isinstance(form.fields['date_joined'].widget,
forms.DateTimeInput))

View file

@ -1,13 +1,14 @@
from django.db import models
from django.contrib.auth.models import Group, User
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
from ..models import ModelAdmin2
from djadmin2.site import djadmin2_site
from .models import SmallThing
from ..core import Admin2
from ..types import ModelAdmin2
class Thing(models.Model):
pass
APP_LABEL, APP_VERBOSE_NAME = 'app_one_label', 'App One Verbose Name'
class Admin2Test(TestCase):
@ -15,21 +16,54 @@ class Admin2Test(TestCase):
self.admin2 = Admin2()
def test_register(self):
self.admin2.register(Thing)
self.assertTrue(isinstance(self.admin2.registry[Thing], ModelAdmin2))
self.admin2.register(SmallThing)
self.assertTrue(isinstance(self.admin2.registry[SmallThing], ModelAdmin2))
def test_register_error(self):
self.admin2.register(Thing)
self.assertRaises(ImproperlyConfigured, self.admin2.register, Thing)
self.admin2.register(SmallThing)
self.assertRaises(ImproperlyConfigured, self.admin2.register, SmallThing)
def test_deregister(self):
self.admin2.register(Thing)
self.admin2.deregister(Thing)
self.assertTrue(Thing not in self.admin2.registry)
self.admin2.register(SmallThing)
self.admin2.deregister(SmallThing)
self.assertTrue(SmallThing not in self.admin2.registry)
def test_deregister_error(self):
self.assertRaises(ImproperlyConfigured, self.admin2.deregister, Thing)
self.assertRaises(ImproperlyConfigured, self.admin2.deregister, SmallThing)
def test_register_app_verbose_name(self):
self.admin2.register_app_verbose_name(APP_LABEL, APP_VERBOSE_NAME)
self.assertEqual(
self.admin2.app_verbose_names[APP_LABEL],
APP_VERBOSE_NAME
)
def test_register_app_verbose_name_error(self):
self.admin2.register_app_verbose_name(APP_LABEL, APP_VERBOSE_NAME)
self.assertRaises(
ImproperlyConfigured,
self.admin2.register_app_verbose_name,
APP_LABEL,
APP_VERBOSE_NAME
)
def test_deregister_app_verbose_name(self):
self.admin2.register_app_verbose_name(APP_LABEL, APP_VERBOSE_NAME)
self.admin2.deregister_app_verbose_name(APP_LABEL)
self.assertTrue(APP_LABEL not in self.admin2.app_verbose_names)
def test_deregister_app_verbose_name_error(self):
self.assertRaises(
ImproperlyConfigured,
self.admin2.deregister_app_verbose_name,
APP_LABEL
)
def test_get_urls(self):
self.admin2.register(Thing)
self.assertEquals(4, len(self.admin2.get_urls()))
self.admin2.register(SmallThing)
self.assertEqual(8, len(self.admin2.get_urls()))
def test_default_entries(self):
expected_default_models = (User, Group, Site)
for model in expected_default_models:
self.assertTrue(isinstance(djadmin2_site.registry[model], ModelAdmin2))

View file

@ -1 +0,0 @@
# TODO - stub out tests

View file

@ -0,0 +1,115 @@
import datetime as dt
from decimal import Decimal
from django.test import TestCase
from django.utils.translation import activate
from .. import renderers
from .models import RendererTestModel
class BooleanRendererTest(TestCase):
def setUp(self):
self.renderer = renderers.boolean_renderer
def test_boolean(self):
out1 = self.renderer(True, None)
self.assertIn('fa fa-check', out1)
out2 = self.renderer(False, None)
self.assertIn('fa fa-minus', out2)
def test_string(self):
out1 = self.renderer('yeah', None)
self.assertIn('fa fa-check', out1)
out2 = self.renderer('', None)
self.assertIn('fa fa-minus', out2)
class DatetimeRendererTest(TestCase):
def setUp(self):
self.renderer = renderers.datetime_renderer
def tearDown(self):
activate('en_US')
def test_date_german(self):
activate('de')
out = self.renderer(dt.date(2013, 7, 6), None)
self.assertEqual('6. Juli 2013', out)
def test_date_spanish(self):
activate('es')
out = self.renderer(dt.date(2013, 7, 6), None)
self.assertEqual('6 de Julio de 2013', out)
def test_date_default(self):
out = self.renderer(dt.date(2013, 7, 6), None)
self.assertEqual('July 6, 2013', out)
def test_time_german(self):
activate('de')
out = self.renderer(dt.time(13, 37, 1), None)
self.assertEqual('13:37', out)
def test_time_chinese(self):
activate('zh')
out = self.renderer(dt.time(13, 37, 1), None)
self.assertEqual('1:37 p.m.', out)
def test_datetime(self):
out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 1), None)
self.assertEqual('July 6, 2013, 1:37 p.m.', out)
def test_date_as_string(self):
out = self.renderer('13:37:01', None)
self.assertEqual('13:37', out)
# TODO test timezone localization
class TitleRendererTest(TestCase):
def setUp(self):
self.renderer = renderers.title_renderer
def testLowercase(self):
out = self.renderer('oh hello there!', None)
self.assertEqual('Oh Hello There!', out)
def testTitlecase(self):
out = self.renderer('Oh Hello There!', None)
self.assertEqual('Oh Hello There!', out)
def testUppercase(self):
out = self.renderer('OH HELLO THERE!', None)
self.assertEqual('Oh Hello There!', out)
class NumberRendererTest(TestCase):
def setUp(self):
self.renderer = renderers.number_renderer
def testInteger(self):
out = self.renderer(42, None)
self.assertEqual('42', out)
def testFloat(self):
out = self.renderer(42.5, None)
self.assertEqual('42.5', out)
def testEndlessFloat(self):
out = self.renderer(1.0 / 3, None)
self.assertEqual('0.3333333333333333', out)
def testPlainDecimal(self):
number = '0.123456789123456789123456789'
out = self.renderer(Decimal(number), None)
self.assertEqual(number, out)
def testFieldDecimal(self):
field = RendererTestModel._meta.get_field('decimal')
out = self.renderer(Decimal('0.123456789'), field)
self.assertEqual('0.12345', out)

View file

@ -0,0 +1,80 @@
from django.test import TestCase
from .. import views
from ..types import ModelAdmin2, immutable_admin_factory
from ..core import Admin2
from .models import BigThing
class ModelAdmin:
model_admin_attributes = ['a', 'b', 'c']
a = 1 # covered
b = 2 # covered
c = 3 # covered
d = 4 # not covered
class ImmutableAdminFactoryTests(TestCase):
def setUp(self):
self.immutable_admin = immutable_admin_factory(ModelAdmin)
def test_immutability(self):
with self.assertRaises(AttributeError):
# can't set attribute
self.immutable_admin.a = 10
with self.assertRaises(AttributeError):
# 'ImmutableAdmin' object has no attribute 'e'
self.immutable_admin.e = 5
with self.assertRaises(AttributeError):
# can't delete attribute
del self.immutable_admin.a
def test_attributes(self):
self.assertEqual(self.immutable_admin.a, 1)
self.assertEqual(self.immutable_admin.b, 2)
self.assertEqual(self.immutable_admin.c, 3)
with self.assertRaises(AttributeError):
# 'ImmutableAdmin' object has no attribute 'd'
self.immutable_admin.d
class ModelAdminTest(TestCase):
def setUp(self):
class MyModelAdmin(ModelAdmin2):
my_view = views.AdminView(r'^$', views.ModelListView)
self.model_admin = MyModelAdmin
def test_views(self):
views = [self.model_admin.my_view] + ModelAdmin2.views
self.assertListEqual(self.model_admin.views, views)
def test_views_not_same(self):
self.assertIsNot(self.model_admin.views, ModelAdmin2.views)
def test_get_index_kwargs(self):
admin_instance = ModelAdmin2(BigThing, Admin2)
self.assertIn(
'paginate_by',
admin_instance.get_index_kwargs().keys()
)
def test_get_urls(self):
admin_instance = ModelAdmin2(BigThing, Admin2)
self.assertEqual(6, len(admin_instance.get_urls()))
def test_get_urls_throws_type_error(self):
with self.assertRaises(TypeError):
try:
admin_instance = ModelAdmin2(BigThing, Admin2)
admin_instance.views = [views.AdminView(None, None, None)]
admin_instance.get_urls()
except TypeError as e:
message = "Cannot instantiate admin view " \
'"ModelAdmin2.None". The error that got raised was: ' \
"'NoneType' object has no attribute 'as_view'"
self.assertEqual(e.args[0], message)
raise

View file

@ -1 +1,151 @@
# TODO - stub out tests
from django.test import TestCase
from .. import utils
from ..views import IndexView
from .models import UtilsTestModel
class UtilsTest(TestCase):
def setUp(self):
self.instance = UtilsTestModel()
def test_as_model_class(self):
self.assertEqual(
UtilsTestModel._meta,
utils.model_options(UtilsTestModel)
)
UtilsTestModel._meta.verbose_name = "Utils Test Model is singular"
UtilsTestModel._meta.verbose_name_plural = "Utils Test Model are " +\
" plural"
self.assertEqual(
UtilsTestModel._meta,
utils.model_options(UtilsTestModel)
)
UtilsTestModel._meta.verbose_name = "Utils Test Model"
UtilsTestModel._meta.verbose_name_plural = "Utils Test Models"
def test_as_model_instance(self):
self.assertEqual(
self.instance._meta,
utils.model_options(self.instance)
)
self.instance._meta.verbose_name = "Utils Test Model is singular"
self.instance._meta.verbose_name_plural = "Utils Test Model are " +\
" plural"
self.assertEqual(
self.instance._meta,
utils.model_options(self.instance)
)
self.instance._meta.verbose_name = "Utils Test Model"
self.instance._meta.verbose_name_plural = "Utils Test Models"
def test_admin2_urlname(self):
self.assertEqual(
"admin2:None_None_index",
utils.admin2_urlname(IndexView, "index")
)
def test_model_app_label_as_model_class(self):
self.assertEqual(
UtilsTestModel._meta.app_label,
utils.model_app_label(UtilsTestModel)
)
def test_model_app_label_as_model_instance(self):
self.assertEqual(
self.instance._meta.app_label,
utils.model_app_label(UtilsTestModel)
)
def test_model_verbose_name_as_model_class(self):
self.assertEqual(
UtilsTestModel._meta.verbose_name,
utils.model_verbose_name(UtilsTestModel)
)
def test_model_verbose_name_as_model_instance(self):
self.assertEqual(
self.instance._meta.verbose_name,
utils.model_verbose_name(self.instance)
)
def test_model_verbose_name_plural_as_model_class(self):
self.assertEqual(
UtilsTestModel._meta.verbose_name_plural,
utils.model_verbose_name_plural(UtilsTestModel)
)
def test_model_verbose_name_plural_as_model_instance(self):
self.assertEqual(
self.instance._meta.verbose_name_plural,
utils.model_verbose_name_plural(self.instance)
)
def test_model_field_verbose_name_autogenerated(self):
self.assertEqual(
'field1',
utils.model_field_verbose_name(self.instance, 'field1')
)
def test_model_field_verbose_name_overridden(self):
self.assertEqual(
'second field',
utils.model_field_verbose_name(self.instance, 'field2')
)
def test_model_method_verbose_name(self):
self.assertEqual(
'Published recently?',
utils.model_method_verbose_name(self.instance, 'was_published_recently')
)
def test_model_method_verbose_name_fallback(self):
self.assertEqual(
'simple_method',
utils.model_method_verbose_name(self.instance, 'simple_method')
)
def test_app_label_as_model_class(self):
self.assertEqual(
UtilsTestModel._meta.app_label,
utils.model_app_label(UtilsTestModel)
)
def test_app_label_as_model_instance(self):
self.assertEqual(
self.instance._meta.app_label,
utils.model_app_label(self.instance)
)
def test_get_attr_callable(self):
class Klass:
def hello(self):
return "hello"
self.assertEqual(
utils.get_attr(Klass(), "hello"),
"hello"
)
def test_get_attr_str(self):
class Klass:
def __str__(self):
return "str"
def __unicode__(self):
return "unicode"
self.assertEqual(
utils.get_attr(Klass(), "__str__"),
"str"
)
def test_get_attr(self):
class Klass:
attr = "value"
self.assertEqual(
utils.get_attr(Klass(), "attr"),
"value"
)

View file

@ -1 +1,30 @@
# TODO - stub out tests
from django.test import TestCase, override_settings
from django.urls import reverse
from django.utils.encoding import force_str
from .. import views
class AdminViewTest(TestCase):
def setUp(self):
self.admin_view = views.AdminView(r'^$', views.ModelListView, name='admin-view')
def test_url(self):
self.assertEqual(self.admin_view.url, r'^$')
def test_view(self):
self.assertEqual(self.admin_view.view, views.ModelListView)
def test_name(self):
self.assertEqual(self.admin_view.name, 'admin-view')
@override_settings(ROOT_URLCONF='djadmin2.tests.urls')
class CustomLoginViewTest(TestCase):
def test_view_ok(self):
response = self.client.get(reverse("admin2:dashboard"))
self.assertInHTML('<h3 class="panel-title">Custom login view</h3>', force_str(response.content))

19
djadmin2/tests/urls.py Normal file
View file

@ -0,0 +1,19 @@
from django.conf import settings
from django.conf.urls.static import static
from django.urls import re_path
from djadmin2.site import djadmin2_site
from djadmin2.views import LoginView
class CustomLoginView(LoginView):
default_template_name = "custom_login_template.html"
djadmin2_site.login_view = CustomLoginView
djadmin2_site.autodiscover()
urlpatterns = [
re_path(r'^admin2/', djadmin2_site.urls),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

View file

View file

@ -0,0 +1,394 @@
body {
background-color: #f8f8f8;
}
#wrapper {
width: 100%;
}
#page-wrapper {
padding: 0 15px;
min-height: 568px;
background-color: #fff;
}
@media (min-width: 768px) {
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid #e7e7e7;
}
}
.navbar-top-links {
margin-right: 0;
}
.navbar-top-links li {
display: inline-block;
}
.navbar-top-links li:last-child {
margin-right: 15px;
}
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
}
.navbar-top-links .dropdown-menu li {
display: block;
}
.navbar-top-links .dropdown-menu li:last-child {
margin-right: 0;
}
.navbar-top-links .dropdown-menu li a {
padding: 3px 20px;
min-height: 0;
}
.navbar-top-links .dropdown-menu li a div {
white-space: normal;
}
.navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-tasks, .navbar-top-links .dropdown-alerts {
width: 310px;
min-width: 0;
}
.navbar-top-links .dropdown-messages {
margin-left: 5px;
}
.navbar-top-links .dropdown-tasks {
margin-left: -59px;
}
.navbar-top-links .dropdown-alerts {
margin-left: -123px;
}
.navbar-top-links .dropdown-user {
right: 0;
left: auto;
}
.sidebar .sidebar-nav.navbar-collapse {
padding-right: 0;
padding-left: 0;
}
.sidebar .sidebar-search {
padding: 15px;
}
.sidebar ul li {
border-bottom: 1px solid #e7e7e7;
}
.sidebar ul li a.active {
background-color: #eeeeee;
}
.sidebar .arrow {
float: right;
}
.sidebar .fa.arrow:before {
content: "\f104";
}
.sidebar .active > a > .fa.arrow:before {
content: "\f107";
}
.sidebar .nav-second-level li, .sidebar .nav-third-level li {
border-bottom: 0 !important;
}
.sidebar .nav-second-level li a {
padding-left: 37px;
}
.sidebar .nav-third-level li a {
padding-left: 52px;
}
@media (min-width: 768px) {
.sidebar {
z-index: 1;
position: absolute;
width: 250px;
margin-top: 51px;
}
.navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-tasks, .navbar-top-links .dropdown-alerts {
margin-left: auto;
}
}
.btn-outline {
color: inherit;
background-color: transparent;
transition: all .5s;
}
.btn-outline.btn-primary {
color: #428bca;
}
.btn-outline.btn-primary:hover {
color: #FFF;
}
.btn-outline.btn-success {
color: #5cb85c;
}
.btn-outline.btn-success:hover {
color: #FFF;
}
.btn-outline.btn-info {
color: #5bc0de;
}
.btn-outline.btn-info:hover {
color: #FFF;
}
.btn-outline.btn-warning {
color: #f0ad4e;
}
.btn-outline.btn-warning:hover {
color: #FFF;
}
.btn-outline.btn-danger {
color: #d9534f;
}
.btn-outline.btn-danger:hover {
color: #FFF;
}
.chat {
margin: 0;
padding: 0;
list-style: none;
}
.chat li {
margin-bottom: 10px;
padding-bottom: 5px;
border-bottom: 1px dotted #999999;
}
.chat li.left .chat-body {
margin-left: 60px;
}
.chat li.right .chat-body {
margin-right: 60px;
}
.chat li .chat-body p {
margin: 0;
}
.panel .slidedown .glyphicon, .chat .glyphicon {
margin-right: 5px;
}
.chat-panel .panel-body {
height: 350px;
overflow-y: scroll;
}
.login-panel {
margin-top: 25%;
}
.flot-chart {
display: block;
height: 400px;
}
.flot-chart-content {
width: 100%;
height: 100%;
}
.dataTables_wrapper {
position: relative;
clear: both;
}
table.dataTable thead .sorting, table.dataTable thead .sorting_asc, table.dataTable thead .sorting_desc, table.dataTable thead .sorting_asc_disabled, table.dataTable thead .sorting_desc_disabled {
background: 0 0;
}
table.dataTable thead .sorting_asc:after {
content: "\f0de";
float: right;
font-family: fontawesome;
}
table.dataTable thead .sorting_desc:after {
content: "\f0dd";
float: right;
font-family: fontawesome;
}
table.dataTable thead .sorting:after {
content: "\f0dc";
float: right;
font-family: fontawesome;
color: rgba(50, 50, 50, 0.5);
}
.btn-circle {
width: 30px;
height: 30px;
padding: 6px 0;
border-radius: 15px;
text-align: center;
font-size: 12px;
line-height: 1.428571429;
}
.btn-circle.btn-lg {
width: 50px;
height: 50px;
padding: 10px 16px;
border-radius: 25px;
font-size: 18px;
line-height: 1.33;
}
.btn-circle.btn-xl {
width: 70px;
height: 70px;
padding: 10px 16px;
border-radius: 35px;
font-size: 24px;
line-height: 1.33;
}
.show-grid {
margin: 15px 0;
}
.show-grid [class^=col-] {
padding-top: 10px;
padding-bottom: 10px;
border: 1px solid #ddd;
background-color: #eee !important;
}
.huge {
font-size: 40px;
}
.panel-green {
border-color: #5cb85c;
}
.panel-green .panel-heading {
border-color: #5cb85c;
color: white;
background-color: #5cb85c;
}
.panel-green a {
color: #5cb85c;
}
.panel-green a:hover {
color: #3d8b3d;
}
.panel-red {
border-color: #d9534f;
}
.panel-red .panel-heading {
border-color: #d9534f;
color: white;
background-color: #d9534f;
}
.panel-red a {
color: #d9534f;
}
.panel-red a:hover {
color: #b52b27;
}
.panel-yellow {
border-color: #f0ad4e;
}
.panel-yellow .panel-heading {
border-color: #f0ad4e;
color: white;
background-color: #f0ad4e;
}
.panel-yellow a {
color: #f0ad4e;
}
.panel-yellow a:hover {
color: #df8a13;
}
.model-search {
margin-bottom: 15px;
}
.sort_link {
display: block;
cursor: pointer;
color: black;
}
.sort_link:hover {
color: black;
}
.previous-link a {
color: gray;
}
.date-drilldown {
padding-bottom: 0;
padding-top: 0;
}
#wrapper.no-sidebar #page-wrapper {
margin: 0;
}
#page-wrapper ol.breadcrumb {
border-radius: 0;
margin-bottom: 0;
}
#page-wrapper h1.page-header {
margin-top: 30px;
font-size: 24px;
}
@media (min-width: 768px) {
#page-wrapper ol.breadcrumb {
margin-left: -15px;
margin-right: -15px;
}
}

View file

@ -0,0 +1,39 @@
$(function() {
var element = $("#model-list");
var selectAllCheckbox = element.find('.model-select-all');
var selectCheckbox = element.find('.model-select');
var selectedCount = element.find('.selected-count');
var updateSelectedCount = function() {
if (selectedCount.length) {
var count = 0;
for (var ix = 0; ix < selectCheckbox.length; ix++) {
if ($(selectCheckbox[ix]).prop('checked')) {
count++;
}
}
selectAllCheckbox.prop('checked', count == selectCheckbox.length);
selectedCount.text(count);
}
};
selectAllCheckbox.click(function(e) {
selectCheckbox.prop('checked', this.checked);
updateSelectedCount();
});
selectCheckbox.click(function(e) {
updateSelectedCount();
});
var actionDropdownLink = element.find('.dropdown-menu a');
actionDropdownLink.click(function (e) {
e.preventDefault();
var form = $(this).closest('form');
form.find('input[name="' + $(this).data('name') + '"]').val(
$(this).data('value'));
form.submit();
});
});

View file

@ -0,0 +1,12 @@
$(document).ready(function() {
/**
* Dynamicaly adds button to each input element
* Required by filter section to allow form to be submitted
*/
$("#filter_form").find('input').each(function(){
var input_field = $(this);
var btn = input_field.after('<button class="btn">Go</button>');
});
});

View file

@ -0,0 +1,30 @@
//Loads the correct sidebar on window load,
//collapses the sidebar on window resize.
// Sets the min-height of #page-wrapper to window size
$(function() {
$(window).bind("load resize", function() {
topOffset = 50;
width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
if (width < 768) {
$('div.navbar-collapse').addClass('collapse');
topOffset = 100; // 2-row-menu
} else {
$('div.navbar-collapse').removeClass('collapse');
}
height = ((this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height) - 1;
height = height - topOffset;
if (height < 1) height = 1;
if (height > topOffset) {
$("#page-wrapper").css("min-height", (height) + "px");
}
});
var url = window.location;
var element = $('ul.nav a').filter(function() {
return this.href == url || url.href.indexOf(this.href) == 0;
}).addClass('active').parent().parent().addClass('in').parent();
if (element.is('li')) {
element.addClass('active');
}
});

View file

@ -0,0 +1,51 @@
@import "sb-admin2/sb-admin-2";
#wrapper {
&.no-sidebar {
#page-wrapper {
margin: 0;
}
}
}
.model-search {
margin-bottom: 15px;
}
.sort_link {
display: block;
cursor: pointer;
color: black;
}
.sort_link:hover {
color: black;
}
.previous-link a {
color: gray;
}
.date-drilldown {
padding-bottom: 0;
padding-top: 0;
}
#page-wrapper {
ol.breadcrumb {
border-radius: 0;
margin-bottom: 0;
}
h1.page-header {
margin-top: 30px;
font-size: 24px;
}
}
@media (min-width: 768px) {
#page-wrapper {
ol.breadcrumb {
margin-left: -15px;
margin-right: -15px;
}
}
}

View file

@ -0,0 +1,366 @@
@import "variables.less";
@import "mixins.less";
// Global Styles
body {
background-color: @gray-lightest;
}
// Wrappers
#wrapper {
width: 100%;
}
#page-wrapper {
padding: 0 15px;
min-height: 568px;
background-color: white;
}
@media(min-width:768px) {
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid darken(@gray-lightest, 6.5%);
}
}
// Navigation
// --Topbar
.navbar-top-links {
margin-right: 0;
}
.navbar-top-links li {
display: inline-block;
}
.navbar-top-links li:last-child {
margin-right: 15px;
}
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
}
.navbar-top-links .dropdown-menu li {
display: block;
}
.navbar-top-links .dropdown-menu li:last-child {
margin-right: 0;
}
.navbar-top-links .dropdown-menu li a {
padding: 3px 20px;
min-height: 0;
}
.navbar-top-links .dropdown-menu li a div {
white-space: normal;
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
width: 310px;
min-width: 0;
}
.navbar-top-links .dropdown-messages {
margin-left: 5px;
}
.navbar-top-links .dropdown-tasks {
margin-left: -59px;
}
.navbar-top-links .dropdown-alerts {
margin-left: -123px;
}
.navbar-top-links .dropdown-user {
right: 0;
left: auto;
}
// --Sidebar
.sidebar {
.sidebar-nav.navbar-collapse {
padding-left: 0;
padding-right: 0;
}
}
.sidebar .sidebar-search {
padding: 15px;
}
.sidebar ul li {
border-bottom: 1px solid darken(@gray-lightest, 6.5%);
a {
&.active {
background-color: @gray-lighter;
}
}
}
.sidebar .arrow {
float: right;
}
.sidebar .fa.arrow:before {
content: "\f104";
}
.sidebar .active > a > .fa.arrow:before {
content: "\f107";
}
.sidebar .nav-second-level li,
.sidebar .nav-third-level li {
border-bottom: none !important;
}
.sidebar .nav-second-level li a {
padding-left: 37px;
}
.sidebar .nav-third-level li a {
padding-left: 52px;
}
@media(min-width:768px) {
.sidebar {
z-index: 1;
position: absolute;
width: 250px;
margin-top: 51px;
}
.navbar-top-links .dropdown-messages,
.navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
margin-left: auto;
}
}
// Buttons
.btn-outline {
color: inherit;
background-color: transparent;
transition: all .5s;
}
.btn-primary.btn-outline {
color: @brand-primary;
}
.btn-success.btn-outline {
color: @brand-success;
}
.btn-info.btn-outline {
color: @brand-info;
}
.btn-warning.btn-outline {
color: @brand-warning;
}
.btn-danger.btn-outline {
color: @brand-danger;
}
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: white;
}
// Chat Widget
.chat {
margin: 0;
padding: 0;
list-style: none;
}
.chat li {
margin-bottom: 10px;
padding-bottom: 5px;
border-bottom: 1px dotted @gray-light;
}
.chat li.left .chat-body {
margin-left: 60px;
}
.chat li.right .chat-body {
margin-right: 60px;
}
.chat li .chat-body p {
margin: 0;
}
.panel .slidedown .glyphicon,
.chat .glyphicon {
margin-right: 5px;
}
.chat-panel .panel-body {
height: 350px;
overflow-y: scroll;
}
// Login Page
.login-panel {
margin-top: 25%;
}
// Flot Charts Containers
.flot-chart {
display: block;
height: 400px;
}
.flot-chart-content {
width: 100%;
height: 100%;
}
// DataTables Overrides
table.dataTable thead .sorting,
table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc,
table.dataTable thead .sorting_asc_disabled,
table.dataTable thead .sorting_desc_disabled {
background: transparent;
}
table.dataTable thead .sorting_asc:after {
content: "\f0de";
float: right;
font-family: fontawesome;
}
table.dataTable thead .sorting_desc:after {
content: "\f0dd";
float: right;
font-family: fontawesome;
}
table.dataTable thead .sorting:after {
content: "\f0dc";
float: right;
font-family: fontawesome;
color: rgba(50,50,50,.5);
}
// Circle Buttons
.btn-circle {
width: 30px;
height: 30px;
padding: 6px 0;
border-radius: 15px;
text-align: center;
font-size: 12px;
line-height: 1.428571429;
}
.btn-circle.btn-lg {
width: 50px;
height: 50px;
padding: 10px 16px;
border-radius: 25px;
font-size: 18px;
line-height: 1.33;
}
.btn-circle.btn-xl {
width: 70px;
height: 70px;
padding: 10px 16px;
border-radius: 35px;
font-size: 24px;
line-height: 1.33;
}
// Grid Demo Elements
.show-grid [class^="col-"] {
padding-top: 10px;
padding-bottom: 10px;
border: 1px solid #ddd;
background-color: #eee !important;
}
.show-grid {
margin: 15px 0;
}
// Custom Colored Panels
.huge {
font-size: 40px;
}
.panel-green {
border-color: @brand-success;
.panel-heading {
border-color: @brand-success;
color: white;
background-color: @brand-success;
}
a {
color: @brand-success;
&:hover {
color: darken(@brand-success, 15%);
}
}
}
.panel-red {
border-color: @brand-danger;
.panel-heading {
border-color: @brand-danger;
color: white;
background-color: @brand-danger;
}
a {
color: @brand-danger;
&:hover {
color: darken(@brand-danger, 15%);
}
}
}
.panel-yellow {
border-color: @brand-warning;
.panel-heading {
border-color: @brand-warning;
color: white;
background-color: @brand-warning;
}
a {
color: @brand-warning;
&:hover {
color: darken(@brand-warning, 15%);
}
}
}

View file

@ -0,0 +1,14 @@
// Variables
@gray-darker: lighten(#000, 13.5%);
@gray-dark: lighten(#000, 20%);
@gray: lighten(#000, 33.5%);
@gray-light: lighten(#000, 60%);
@gray-lighter: lighten(#000, 93.5%);
@gray-lightest: lighten(#000, 97.25%);
@brand-primary: #428bca;
@brand-success: #5cb85c;
@brand-info: #5bc0de;
@brand-warning: #f0ad4e;
@brand-danger: #d9534f;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,288 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
<font-face units-per-em="1200" ascent="960" descent="-240" />
<missing-glyph horiz-adv-x="500" />
<glyph horiz-adv-x="0" />
<glyph horiz-adv-x="400" />
<glyph unicode=" " />
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xa0;" />
<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
<glyph unicode="&#x2000;" horiz-adv-x="650" />
<glyph unicode="&#x2001;" horiz-adv-x="1300" />
<glyph unicode="&#x2002;" horiz-adv-x="650" />
<glyph unicode="&#x2003;" horiz-adv-x="1300" />
<glyph unicode="&#x2004;" horiz-adv-x="433" />
<glyph unicode="&#x2005;" horiz-adv-x="325" />
<glyph unicode="&#x2006;" horiz-adv-x="216" />
<glyph unicode="&#x2007;" horiz-adv-x="216" />
<glyph unicode="&#x2008;" horiz-adv-x="162" />
<glyph unicode="&#x2009;" horiz-adv-x="260" />
<glyph unicode="&#x200a;" horiz-adv-x="72" />
<glyph unicode="&#x202f;" horiz-adv-x="260" />
<glyph unicode="&#x205f;" horiz-adv-x="325" />
<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 106 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show more