Skip to content

Commit

Permalink
Merge branch 'release-1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Apr 17, 2019
2 parents 1366b75 + 9bfe56a commit a4fc509
Show file tree
Hide file tree
Showing 25 changed files with 17,037 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ docs/_templates
baton/static/baton/app/npm-debug.log
baton/static/baton/app/node_modules
build/
dist/
/dist/
tags
django_baton.egg-info/
.ropeproject
36 changes: 5 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Downloads](https://pepy.tech/badge/django-baton)](https://pepy.tech/project/django-baton)

A cool, modern and responsive django admin application, based on bootstrap 4.1.3
A cool, modern and responsive django admin application, based on bootstrap 4.3.1

Documentation: [readthedocs](http://django-baton.readthedocs.io/)

Expand All @@ -18,18 +18,16 @@ Documentation: [readthedocs](http://django-baton.readthedocs.io/)
- [Text Input Filters](#text-input-filters)
- [Form Tabs](#form-tabs)
- [Customization](#customization)
- [Known Issues](#known-issues)
- [TODO](#todo)
- [Screenshots](#screenshots)

## <a name="features"></a>Features

Tested with django 1.10.5, 1.11.1 and 2.0
Tested with django 1.10.5, 1.11.1, 2.0, 2.1 and 2.2

This application was written with one concept in mind: overwrite as few django templates as possible.
Everything is styled through css, and when an help is needed, js is armed.

- Based on bootstrap 4.1.3 and FontAwesome 4.7
- Based on bootstrap 4.3.1 and FontAwesome Free 5.8.1
- Fully responsive
- Custom and flexible sidebar menu
- Text input filters facility
Expand All @@ -51,8 +49,8 @@ At the moment __baton__ defines only 3 custom templates:

Baton is based on the following frontend technologies:

- bootstrap 4.1.3
- FontAwesome 4.7.0
- bootstrap 4.3.1
- FontAwesome 5.8.1 (solid and brands)

Flexbox is used here and there to accomplish responsiveness. jQuery is used for DOM manipulations.

Expand Down Expand Up @@ -337,30 +335,6 @@ And the inside the `base_site.html` template make these changes:

Now while you make your changes to the js app (css included), webpack will update the bundle automatically, so just refresh the page and you'll see your changes.

## <a name="known-issues"></a>Known Issues

Some issues which are known, and may or may not be fixed in the future.

This application is meant for use with modern browsers, targeting all recent versions of chrome, firefox an IE. Surely it will cause graphic disasters with older IE versions.

### Wrap multiple fields in the same line in fieldsets

It is possible in django to wrap multiple fields in the same line, when defining a fieldset:

{
'fields': (('first_name', 'last_name'), 'address', 'city', 'state'),
}

putting `first_name` and `last_name` in their own tuple will fire this behaviour.

This feature is not supported in django-baton, because field-rows are not supposed to be inline.

I think I won't fix this, I prefer using other approaches in these situations, like for example write a custom widget.

## <a name="todo"></a>TODO

- write tests

## <a name="screenshots"></a>Screenshots

![Screenshot](screenshots/mobile_mix.jpg)
Expand Down
42 changes: 22 additions & 20 deletions baton/static/baton/app/dist/baton.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion baton/static/baton/app/dist/baton.min.js.map

Large diffs are not rendered by default.

Binary file added baton/static/baton/app/dist/fa-brands-400.eot
Binary file not shown.
3,459 changes: 3,459 additions & 0 deletions baton/static/baton/app/dist/fa-brands-400.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added baton/static/baton/app/dist/fa-brands-400.ttf
Binary file not shown.
Binary file added baton/static/baton/app/dist/fa-solid-900.eot
Binary file not shown.
4,527 changes: 4,527 additions & 0 deletions baton/static/baton/app/dist/fa-solid-900.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added baton/static/baton/app/dist/fa-solid-900.ttf
Binary file not shown.

0 comments on commit a4fc509

Please sign in to comment.