Compare commits

..

22 Commits

Author SHA1 Message Date
Fabio Caccamo 73c9a54d94 Updated version 2018-02-06 15:31:19 +01:00
Fabio Caccamo eff414b40c Removed old selector fixies 2018-02-06 15:31:09 +01:00
Fabio Caccamo ccbf76dc5a Improved jquery.ui.tabs compatibility 2018-02-06 15:30:29 +01:00
Fabio Caccamo 5b6e83751b Updated README [ci skip] 2018-02-05 12:37:02 +01:00
Fabio Caccamo 572294f646 Updated version 2018-02-05 12:24:54 +01:00
Fabio Caccamo 4e18d36c79 Added django-tabbed-admin style support 2018-02-05 12:24:42 +01:00
Fabio Caccamo ee9994231b Fixed selectors text overflow 2018-02-05 12:23:54 +01:00
Fabio Caccamo fb4cfdb772 Updated version 2018-02-01 14:52:56 +01:00
Fabio Caccamo 8535232598 Merge pull request #32 from founders4schools/django-20-simple-tag
Avoid deprecation warning about assignment_tag
2018-02-01 14:51:08 +01:00
Bruno Alla abbb666eae Avoid deprecation warning about assignment_tag
Even though the try/except is Django 2.0 compatible, it still
accesses the deprecated template tag, and therefore it emits a
warning in the console, whereas it's actually fixed.

I tried to swap the try and the catch, but it doesn't work:
`simple_tag` existed before 1.9 but in a non-compatible form.

I've changed the decorator name we use to match the new Django version,
it should make the codebase more future proof.
2018-02-01 13:35:54 +00:00
Fabio Caccamo d48fc882f1 Updated USWDS fixture [ci skip] 2018-01-31 16:38:08 +01:00
Fabio Caccamo f968bd9ffa Updated README [ci skip] 2018-01-31 16:37:36 +01:00
Fabio Caccamo c0592276de Updated README [ci skip] 2018-01-31 12:36:43 +01:00
Fabio Caccamo 451679d565 Updated version 2018-01-31 12:24:22 +01:00
Fabio Caccamo e579134152 Added enviroment display and customization 2018-01-31 12:24:08 +01:00
Fabio Caccamo 6e57cf558c Updated .gitignore [ci skip] 2018-01-31 12:12:01 +01:00
Fabio Caccamo d00428c30a Tested against django 2.0 2017-12-05 12:14:27 +01:00
Fabio Caccamo 9becccce39 Updated version 2017-11-23 12:10:32 +01:00
Fabio Caccamo 64a9e8371c Updated setup.py 2017-11-23 12:10:19 +01:00
Fabio Caccamo 8a85334f68 Changed related_modal_background_opacity field type from FloatField to CharField 2017-11-23 12:10:06 +01:00
Fabio Caccamo 41a5ba61c8 Fixed migrations pep8 compliance 2017-11-23 12:08:36 +01:00
Fabio Caccamo c780ccfbcf Added Requirements Status badge provided by https://requires.io/ [ci skip] 2017-10-18 15:52:42 +02:00
26 changed files with 755 additions and 220 deletions
+2
View File
@@ -55,3 +55,5 @@ docs/_build/
# PyBuilder # PyBuilder
target/ target/
screenshots
TODO.txt
+4
View File
@@ -9,15 +9,19 @@ env:
- TOX_ENV=py34-18 - TOX_ENV=py34-18
- TOX_ENV=py34-19 - TOX_ENV=py34-19
- TOX_ENV=py34-110 - TOX_ENV=py34-110
- TOX_ENV=py34-20
- TOX_ENV=py34-master - TOX_ENV=py34-master
- TOX_ENV=py35-18 - TOX_ENV=py35-18
- TOX_ENV=py35-19 - TOX_ENV=py35-19
- TOX_ENV=py35-110 - TOX_ENV=py35-110
- TOX_ENV=py35-20
- TOX_ENV=py35-master - TOX_ENV=py35-master
matrix: matrix:
include: include:
- python: "3.6" - python: "3.6"
env: TOX_ENV=py36-111 env: TOX_ENV=py36-111
- python: "3.6"
env: TOX_ENV=py36-20
- python: "3.6" - python: "3.6"
env: TOX_ENV=py36-master env: TOX_ENV=py36-master
allow_failures: allow_failures:
+10 -3
View File
@@ -8,17 +8,24 @@
# django-admin-interface # django-admin-interface
django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**. django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.
![django-admin-interface-preview](https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif)
## Features ## Features
- Beautiful default **django-theme** - Beautiful default **django-theme**
- Themes management and customization *(you can **customize admin title, logo and colors**)* - Themes management and customization *(you can **customize admin title, logo and colors**)*
- Responsive - Responsive
- List filter dropdown *(optional)* - List filter dropdown *(optional)*
- `NEW` **Related modal** *(instead of the old popup window, optional)* - `NEW` **Related modal** *(instead of the old popup window, optional)*
- Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail` - `NEW` **Enviroment label** *(development, testing, staging, production)*
- Style optimizations for:
- `django-ckeditor`
- `django-modeltranslation`
- `django-tabbed-admin`
- `sorl-thumbnail`
## Requirements ## Requirements
- Python 2.7, 3.4, 3.5, 3.6 - Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11 - Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
## Installation ## Installation
- Run `pip install django-admin-interface` - Run `pip install django-admin-interface`
@@ -27,7 +34,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
INSTALLED_APPS = ( INSTALLED_APPS = (
#... #...
'admin_interface', 'admin_interface',
'flat_responsive', 'flat_responsive', # only if django version < 2.0
'flat', # only if django version < 1.9 'flat', # only if django version < 1.9
'colorfield', 'colorfield',
#... #...
+13 -3
View File
@@ -6,6 +6,9 @@ django-admin-interface
django-admin-interface is a modern **responsive flat admin interface django-admin-interface is a modern **responsive flat admin interface
customizable by the admin itself**. customizable by the admin itself**.
|django-admin-interface_preview|
---------------------------------
Features Features
-------- --------
@@ -14,19 +17,24 @@ Features
- Responsive - Responsive
- List filter dropdown *(optional)* - List filter dropdown *(optional)*
- ``NEW`` **Related modal** (instead of the old popup window, optional) - ``NEW`` **Related modal** (instead of the old popup window, optional)
- Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail`` - ``NEW`` **Enviroment label** (development, testing, staging, production)
- Style optimizations for:
- `django-ckeditor`
- `django-modeltranslation`
- `django-tabbed-admin`
- `sorl-thumbnail`
Requirements Requirements
------------ ------------
- Python 2.7, 3.4, 3.5, 3.6 - Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11 - Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
Installation Installation
------------ ------------
- Run ``pip install django-admin-interface`` - Run ``pip install django-admin-interface``
- Add ``admin_interface``, ``flat_responsive``, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin`` - Add ``admin_interface``, ``flat_responsive`` *(only if django version < 2.0)*, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
- Run ``python manage.py migrate`` - Run ``python manage.py migrate``
- Run ``python manage.py collectstatic`` - Run ``python manage.py collectstatic``
- Restart your application server - Restart your application server
@@ -133,6 +141,8 @@ Released under **MIT License**.
.. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg .. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
.. |django-admin-interface_preview| image:: https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif
.. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif .. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif
.. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif .. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
+7
View File
@@ -15,6 +15,13 @@ class ThemeAdmin(admin.ModelAdmin):
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ('name', 'active', ) 'fields': ('name', 'active', )
}), }),
('Enviroment', {
'classes': ('wide', ),
'fields': (
'env',
'env_visible',
)
}),
('Logo', { ('Logo', {
'classes': ('wide', ), 'classes': ('wide', ),
'fields': ( 'fields': (
@@ -4,12 +4,12 @@
"fields": { "fields": {
"name": "USWDS", "name": "USWDS",
"active": true, "active": true,
"title": "Site administration", "title": "Django administration",
"title_color": "#FFFFFF", "title_color": "#FFFFFF",
"title_visible": true, "title_visible": false,
"logo": "", "logo": "",
"logo_color": "#FFFFFF", "logo_color": "#FFFFFF",
"logo_visible": false, "logo_visible": true,
"css_header_background_color": "#112E51", "css_header_background_color": "#112E51",
"css_header_text_color": "#FFFFFF", "css_header_text_color": "#FFFFFF",
"css_header_link_color": "#FFFFFF", "css_header_link_color": "#FFFFFF",
+161 -27
View File
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models, migrations from django.db import models, migrations
import colorfield.fields import colorfield.fields
@@ -14,33 +16,165 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Theme', name='Theme',
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id',
('name', models.CharField(default=b'Django', max_length=50)), models.AutoField(
('active', models.BooleanField(default=True)), verbose_name='ID',
('title', models.CharField(default=b'Django administration', max_length=50, blank=True)), serialize=False,
('title_visible', models.BooleanField(default=True, verbose_name=b'visible')), auto_created=True,
('logo', models.FileField(upload_to=b'admin-interface/logo/', blank=True)), primary_key=True)),
('logo_visible', models.BooleanField(default=True, verbose_name=b'visible')), ('name',
('css_header_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)), models.CharField(
('css_header_title_color', colorfield.fields.ColorField(default=b'#F5DD5D', help_text=b'#F5DD5D', max_length=10, verbose_name=b'title color', blank=True)), default=b'Django',
('css_header_text_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'text color', blank=True)), max_length=50)),
('css_header_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)), ('active',
('css_header_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)), models.BooleanField(
('css_module_background_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'background color', blank=True)), default=True)),
('css_module_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)), ('title',
('css_module_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)), models.CharField(
('css_module_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)), default=b'Django administration',
('css_module_rounded_corners', models.BooleanField(default=True, verbose_name=b'rounded corners')), max_length=50,
('css_generic_link_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'link color', blank=True)), blank=True)),
('css_generic_link_hover_color', colorfield.fields.ColorField(default=b'#156641', help_text=b'#156641', max_length=10, verbose_name=b'link hover color', blank=True)), ('title_visible',
('css_save_button_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)), models.BooleanField(
('css_save_button_background_hover_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'background hover color', blank=True)), default=True,
('css_save_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)), verbose_name=b'visible')),
('css_delete_button_background_color', colorfield.fields.ColorField(default=b'#BA2121', help_text=b'#BA2121', max_length=10, verbose_name=b'background color', blank=True)), ('logo',
('css_delete_button_background_hover_color', colorfield.fields.ColorField(default=b'#A41515', help_text=b'#A41515', max_length=10, verbose_name=b'background hover color', blank=True)), models.FileField(
('css_delete_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)), upload_to=b'admin-interface/logo/',
('css', models.TextField(blank=True)), blank=True)),
('list_filter_dropdown', models.BooleanField(default=False)), ('logo_visible',
models.BooleanField(
default=True,
verbose_name=b'visible')),
('css_header_background_color',
colorfield.fields.ColorField(
default=b'#0C4B33',
help_text=b'#0C4B33',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_header_title_color',
colorfield.fields.ColorField(
default=b'#F5DD5D',
help_text=b'#F5DD5D',
max_length=10,
verbose_name=b'title color',
blank=True)),
('css_header_text_color',
colorfield.fields.ColorField(
default=b'#44B78B',
help_text=b'#44B78B',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_header_link_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_header_link_hover_color',
colorfield.fields.ColorField(
default=b'#C9F0DD',
help_text=b'#C9F0DD',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_module_background_color',
colorfield.fields.ColorField(
default=b'#44B78B',
help_text=b'#44B78B',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_module_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_module_link_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_module_link_hover_color',
colorfield.fields.ColorField(
default=b'#C9F0DD',
help_text=b'#C9F0DD',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_module_rounded_corners',
models.BooleanField(
default=True,
verbose_name=b'rounded corners')),
('css_generic_link_color',
colorfield.fields.ColorField(
default=b'#0C3C26',
help_text=b'#0C3C26',
max_length=10,
verbose_name=b'link color',
blank=True)),
('css_generic_link_hover_color',
colorfield.fields.ColorField(
default=b'#156641',
help_text=b'#156641',
max_length=10,
verbose_name=b'link hover color',
blank=True)),
('css_save_button_background_color',
colorfield.fields.ColorField(
default=b'#0C4B33',
help_text=b'#0C4B33',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_save_button_background_hover_color',
colorfield.fields.ColorField(
default=b'#0C3C26',
help_text=b'#0C3C26',
max_length=10,
verbose_name=b'background hover color',
blank=True)),
('css_save_button_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css_delete_button_background_color',
colorfield.fields.ColorField(
default=b'#BA2121',
help_text=b'#BA2121',
max_length=10,
verbose_name=b'background color',
blank=True)),
('css_delete_button_background_hover_color',
colorfield.fields.ColorField(
default=b'#A41515',
help_text=b'#A41515',
max_length=10,
verbose_name=b'background hover color',
blank=True)),
('css_delete_button_text_color',
colorfield.fields.ColorField(
default=b'#FFFFFF',
help_text=b'#FFFFFF',
max_length=10,
verbose_name=b'text color',
blank=True)),
('css',
models.TextField(
blank=True)),
('list_filter_dropdown',
models.BooleanField(
default=False)),
], ],
options={ options={
'verbose_name': 'Theme', 'verbose_name': 'Theme',
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
import colorfield.fields import colorfield.fields
@@ -15,26 +17,44 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='list_filter_dropdown', name='list_filter_dropdown',
field=models.BooleanField(default=False, verbose_name=b'use dropdown'), field=models.BooleanField(
default=False,
verbose_name=b'use dropdown'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='related_modal_active', name='related_modal_active',
field=models.BooleanField(default=True, verbose_name=b'active'), field=models.BooleanField(
default=True,
verbose_name=b'active'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='related_modal_background_color', name='related_modal_background_color',
field=colorfield.fields.ColorField(blank=True, default=b'#000000', help_text=b'#000000', max_length=10, verbose_name=b'background color'), field=colorfield.fields.ColorField(
blank=True,
default=b'#000000',
help_text=b'#000000',
max_length=10,
verbose_name=b'background color'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='related_modal_background_opacity', name='related_modal_background_opacity',
field=models.FloatField(choices=[(0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'), (0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'), (0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')], default=0.2, help_text=b'20%', verbose_name=b'background opacity'), field=models.FloatField(
choices=[
(0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'),
(0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'),
(0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')],
default=0.2,
help_text=b'20%',
verbose_name=b'background opacity'),
), ),
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='related_modal_rounded_corners', name='related_modal_rounded_corners',
field=models.BooleanField(default=True, verbose_name=b'rounded corners'), field=models.BooleanField(
default=True,
verbose_name=b'rounded corners'),
), ),
] ]
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations, models from django.db import migrations, models
@@ -15,11 +17,19 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='logo_color', name='logo_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='logo color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='logo color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='logo', name='logo',
field=models.FileField(blank=True, help_text='(leave blank to use the default Django logo)', upload_to='admin-interface/logo/'), field=models.FileField(
blank=True,
help_text='(leave blank to use the default Django logo)',
upload_to='admin-interface/logo/'),
), ),
] ]
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations from django.db import migrations
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.1 on 2017-05-23 15:37
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='recent_actions_visible', name='recent_actions_visible',
field=models.BooleanField(default=True, verbose_name='visible'), field=models.BooleanField(
default=True,
verbose_name='visible'),
), ),
] ]
+143 -28
View File
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-06-09 14:52
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations, models from django.db import migrations, models
@@ -16,136 +17,250 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_delete_button_background_color', name='css_delete_button_background_color',
field=colorfield.fields.ColorField(blank=True, default='#BA2121', help_text='#BA2121', max_length=10, verbose_name='background color'), field=colorfield.fields.ColorField(
blank=True,
default='#BA2121',
help_text='#BA2121',
max_length=10,
verbose_name='background color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_delete_button_background_hover_color', name='css_delete_button_background_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#A41515', help_text='#A41515', max_length=10, verbose_name='background hover color'), field=colorfield.fields.ColorField(
blank=True,
default='#A41515',
help_text='#A41515',
max_length=10,
verbose_name='background hover color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_delete_button_text_color', name='css_delete_button_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_generic_link_color', name='css_generic_link_color',
field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='link color'), field=colorfield.fields.ColorField(
blank=True,
default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name='link color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_generic_link_hover_color', name='css_generic_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#156641', help_text='#156641', max_length=10, verbose_name='link hover color'), field=colorfield.fields.ColorField(
blank=True,
default='#156641',
help_text='#156641',
max_length=10,
verbose_name='link hover color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_header_background_color', name='css_header_background_color',
field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'), field=colorfield.fields.ColorField(
blank=True,
default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name='background color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_header_link_color', name='css_header_link_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='link color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_header_link_hover_color', name='css_header_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'), field=colorfield.fields.ColorField(
blank=True,
default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name='link hover color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_header_text_color', name='css_header_text_color',
field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='text color'), field=colorfield.fields.ColorField(
blank=True,
default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name='text color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_module_background_color', name='css_module_background_color',
field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='background color'), field=colorfield.fields.ColorField(
blank=True,
default='#44B78B',
help_text='#44B78B',
max_length=10,
verbose_name='background color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_module_link_color', name='css_module_link_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='link color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_module_link_hover_color', name='css_module_link_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'), field=colorfield.fields.ColorField(
blank=True,
default='#C9F0DD',
help_text='#C9F0DD',
max_length=10,
verbose_name='link hover color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_module_rounded_corners', name='css_module_rounded_corners',
field=models.BooleanField(default=True, verbose_name='rounded corners'), field=models.BooleanField(
default=True,
verbose_name='rounded corners'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_module_text_color', name='css_module_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_save_button_background_color', name='css_save_button_background_color',
field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'), field=colorfield.fields.ColorField(
blank=True,
default='#0C4B33',
help_text='#0C4B33',
max_length=10,
verbose_name='background color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_save_button_background_hover_color', name='css_save_button_background_hover_color',
field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='background hover color'), field=colorfield.fields.ColorField(
blank=True,
default='#0C3C26',
help_text='#0C3C26',
max_length=10,
verbose_name='background hover color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='css_save_button_text_color', name='css_save_button_text_color',
field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'), field=colorfield.fields.ColorField(
blank=True,
default='#FFFFFF',
help_text='#FFFFFF',
max_length=10,
verbose_name='text color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='list_filter_dropdown', name='list_filter_dropdown',
field=models.BooleanField(default=False, verbose_name='use dropdown'), field=models.BooleanField(
default=False,
verbose_name='use dropdown'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='logo_visible', name='logo_visible',
field=models.BooleanField(default=True, verbose_name='visible'), field=models.BooleanField(
default=True,
verbose_name='visible'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='name', name='name',
field=models.CharField(default='Django', max_length=50), field=models.CharField(
default='Django',
max_length=50),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='related_modal_active', name='related_modal_active',
field=models.BooleanField(default=True, verbose_name='active'), field=models.BooleanField(
default=True,
verbose_name='active'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='related_modal_background_color', name='related_modal_background_color',
field=colorfield.fields.ColorField(blank=True, default='#000000', help_text='#000000', max_length=10, verbose_name='background color'), field=colorfield.fields.ColorField(
blank=True,
default='#000000',
help_text='#000000',
max_length=10,
verbose_name='background color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='related_modal_background_opacity', name='related_modal_background_opacity',
field=models.FloatField(choices=[(0.1, '10%'), (0.2, '20%'), (0.3, '30%'), (0.4, '40%'), (0.5, '50%'), (0.6, '60%'), (0.7, '70%'), (0.8, '80%'), (0.9, '90%')], default=0.2, help_text='20%', verbose_name='background opacity'), field=models.FloatField(
choices=[
(0.1, '10%'), (0.2, '20%'), (0.3, '30%'),
(0.4, '40%'), (0.5, '50%'), (0.6, '60%'),
(0.7, '70%'), (0.8, '80%'), (0.9, '90%')],
default=0.2,
help_text='20%',
verbose_name='background opacity'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='related_modal_rounded_corners', name='related_modal_rounded_corners',
field=models.BooleanField(default=True, verbose_name='rounded corners'), field=models.BooleanField(
default=True,
verbose_name='rounded corners'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='title', name='title',
field=models.CharField(blank=True, default='Django administration', max_length=50), field=models.CharField(
blank=True,
default='Django administration',
max_length=50),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='title_color', name='title_color',
field=colorfield.fields.ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', max_length=10, verbose_name='title color'), field=colorfield.fields.ColorField(
blank=True,
default='#F5DD5D',
help_text='#F5DD5D',
max_length=10,
verbose_name='title color'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='theme', model_name='theme',
name='title_visible', name='title_visible',
field=models.BooleanField(default=True, verbose_name='visible'), field=models.BooleanField(
default=True,
verbose_name='visible'),
), ),
] ]
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-08-24 10:49
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='theme', model_name='theme',
name='favicon', name='favicon',
field=models.FileField(blank=True, help_text='(.ico|.png|.gif - 16x16|32x32 px)', upload_to='admin-interface/favicon/', verbose_name='favicon'), field=models.FileField(
blank=True,
help_text='(.ico|.png|.gif - 16x16|32x32 px)',
upload_to='admin-interface/favicon/',
verbose_name='favicon'),
), ),
] ]
@@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0007_add_favicon'),
]
operations = [
migrations.AlterField(
model_name='theme',
name='related_modal_background_opacity',
field=models.CharField(
choices=[
('0.1', '10%'), ('0.2', '20%'), ('0.3', '30%'),
('0.4', '40%'), ('0.5', '50%'), ('0.6', '60%'),
('0.7', '70%'), ('0.8', '80%'), ('0.9', '90%')],
default='0.3',
help_text='20%',
max_length=5,
verbose_name='background opacity'),
),
]
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-01-31 11:00
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('admin_interface', '0008_change_related_modal_background_opacity_type'),
]
operations = [
migrations.AddField(
model_name='theme',
name='env',
field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'),
),
migrations.AddField(
model_name='theme',
name='env_visible',
field=models.BooleanField(default=True, verbose_name='visible'),
),
]
+25 -11
View File
@@ -73,6 +73,19 @@ class Theme(models.Model):
upload_to='admin-interface/favicon/', blank=True, upload_to='admin-interface/favicon/', blank=True,
help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon') help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')
env_choices = (
('development', 'Development', ),
('testing', 'Testing', ),
('staging', 'Staging', ),
('production', 'Production', ),
)
env = models.CharField(
max_length=50,
choices=env_choices,
default='development', verbose_name='enviroment')
env_visible = models.BooleanField(
default=True, verbose_name='visible')
css_header_background_color = ColorField( css_header_background_color = ColorField(
blank=True, default='#0C4B33', help_text='#0C4B33', blank=True, default='#0C4B33', help_text='#0C4B33',
max_length=10, verbose_name='background color') max_length=10, verbose_name='background color')
@@ -136,19 +149,20 @@ class Theme(models.Model):
blank=True, default='#000000', help_text='#000000', blank=True, default='#000000', help_text='#000000',
max_length=10, verbose_name='background color') max_length=10, verbose_name='background color')
related_modal_background_opacity_choices = ( related_modal_background_opacity_choices = (
(0.1, '10%', ), ('0.1', '10%', ),
(0.2, '20%', ), ('0.2', '20%', ),
(0.3, '30%', ), ('0.3', '30%', ),
(0.4, '40%', ), ('0.4', '40%', ),
(0.5, '50%', ), ('0.5', '50%', ),
(0.6, '60%', ), ('0.6', '60%', ),
(0.7, '70%', ), ('0.7', '70%', ),
(0.8, '80%', ), ('0.8', '80%', ),
(0.9, '90%', ), ('0.9', '90%', ),
) )
related_modal_background_opacity = models.FloatField( related_modal_background_opacity = models.CharField(
max_length=5,
choices=related_modal_background_opacity_choices, choices=related_modal_background_opacity_choices,
default=0.2, help_text='20%', verbose_name='background opacity') default='0.3', help_text='20%', verbose_name='background opacity')
related_modal_rounded_corners = models.BooleanField( related_modal_rounded_corners = models.BooleanField(
default=True, verbose_name='rounded corners') default=True, verbose_name='rounded corners')
@@ -19,8 +19,10 @@ https://github.com/fabiocaccamo/django-admin-interface
{% include "admin_interface/css/list-filter-dropdown.css" %} {% include "admin_interface/css/list-filter-dropdown.css" %}
{% include "admin_interface/css/recent-actions.css" %} {% include "admin_interface/css/recent-actions.css" %}
{% include "admin_interface/css/related-modal.css" %} {% include "admin_interface/css/related-modal.css" %}
{% include "admin_interface/css/jquery.ui.tabs.css" %}
{% include "admin_interface/css/modeltranslation.css" %} {% include "admin_interface/css/modeltranslation.css" %}
{% include "admin_interface/css/sorl-thumbnail.css" %} {% include "admin_interface/css/sorl-thumbnail.css" %}
{% include "admin_interface/css/tabbed-admin.css" %}
{% include "admin_interface/css/ckeditor.css" %} {% include "admin_interface/css/ckeditor.css" %}
{% include "admin_interface/css/tinymce.css" %} {% include "admin_interface/css/tinymce.css" %}
@@ -64,4 +66,9 @@ https://github.com/fabiocaccamo/django-admin-interface
<span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span> <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
{% endif %} {% endif %}
</h1> </h1>
{% endblock %}
{% block welcome-msg %}
{% get_admin_interface_theme as theme %}
{% if theme.env_visible %}<span class="enviroment-label {{ theme.env }}"></span> - {% endif %}{{ block.super }}<br>
{% endblock %} {% endblock %}
@@ -308,79 +308,28 @@ body.admin-interface .paginator a.showall:visited {
width: 100% !important; width: 100% !important;
flex: 0 1 auto; flex: 0 1 auto;
} }
.admin-interface .aligned .form-row input[type="file"] {
width: 100% !important;
}
} }
/* improve responsive selector */ /* improve responsive selector */
/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector (stacked and not) */ /* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector */
.admin-interface .selector .selector-available select, .admin-interface .selector .selector-available select,
.admin-interface .selector .selector-chosen select { .admin-interface .selector .selector-chosen select {
padding: 7px 10px; padding: 7px 10px;
display: block; display: block;
} }
/* fix [not-stacked] selector */ /* fix [stacked, not-stacked] select options text overflow */
.admin-interface .selector:not(.stacked) { .admin-interface .selector .selector-available select option,
width: auto; .admin-interface .selector .selector-chosen select option {
margin-right: 10px; overflow: hidden;
text-overflow: ellipsis;
} }
/* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */ /* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */
.admin-interface .selector:not(.stacked) .selector-chosen select { .admin-interface .selector:not(.stacked) .selector-chosen select {
height: calc(46px + 17.2em) !important; height: calc(46px + 17.2em) !important;
} }
@media (max-width: 1024px){
.admin-interface .related-widget-wrapper-link + .selector:not(.stacked) {
width: 100%;
}
}
@media (min-width: 767px) and (max-width: 1124px){
.admin-interface .selector:not(.stacked) .selector-available,
.admin-interface .selector:not(.stacked) .selector-chosen {
width: 285px;
flex: 0 1 auto;
}
.admin-interface .selector:not(.stacked) .selector-filter {
display: flex;
align-items: center;
}
.admin-interface .selector:not(.stacked) .selector-filter label {
margin: 0;
}
.admin-interface .selector:not(.stacked) .selector-available input {
width: auto;
flex: 1 1;
}
.admin-interface .selector:not(.stacked) select {
width: 100%;
}
}
/* fix [not-stacked] in tabular inline context */
.admin-interface .tabular.inline-related .selector:not(.stacked) {
width: 795px;
float: none;
display: inline-block;
margin-right: 22px;
}
.admin-interface .tabular.inline-related .form-row .related-widget-wrapper-link:first-child {
float: right;
display: inline-block;
}
/* fix [stacked] in tabular inline context */
.admin-interface .tabular.inline-related .selector.stacked {
width: 480px;
float: none;
display: inline-block;
margin-right: 22px;
}
/* fix [stacked] chooser align center */
.admin-interface .selector.stacked .selector-chooser {
margin-left:calc(50% - 30px);
}
File diff suppressed because one or more lines are too long
@@ -0,0 +1,144 @@
/*
* jQuery UI CSS Framework
* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.core.css
*/
/*
backward compatibility:
.ui-tabs-selected: jquery ui < 1.10
.ui-tabs-active classes jquery ui >= 1.10
*/
/* Layout helpers
----------------------------------*/
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
/* required comment for clearfix to work in Opera \*/
* html .ui-helper-clearfix { height:1%; }
.ui-helper-clearfix { display:block; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
.ui-state-disabled { cursor: default !important; }
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
/* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.tabs.css */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
.ui-tabs .ui-tabs-hide {
position: absolute;
display: none;
}
/* Custom tabs theme */
.admin-interface .ui-tabs {
padding: 0;
}
.admin-interface .ui-tabs,
.admin-interface .ui-tabs .ui-widget-header,
.admin-interface .ui-tabs .ui-widget-header .ui-state-default {
border: none;
background: transparent;
}
.admin-interface .ui-tabs .ui-tabs-nav {
padding: 10px 0 0 10px;
border-bottom: none;
}
.admin-interface .ui-tabs .ui-tabs-nav li {
margin: 0 0 0 -1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li.required {
font-weight: bold;
}
.admin-interface .ui-tabs .ui-tabs-nav li a {
border: 1px solid #eeeeee;
background-color: #f8f8f8;
border-bottom: none;
color: #666666;
padding: 7px 14px 8px 14px;
margin-top: 1px;
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
font-size: 12px;
text-transform: uppercase;
outline: none;
}
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
padding: 8px 14px 8px 14px;
margin-top: 0px;
margin-bottom: -1px;
font-weight: bold;
background-color: #FFFFFF;
color: {{ theme.css_module_background_color }};
border-bottom: 1px solid #FFFFFF;
}
.admin-interface .ui-tabs .ui-tabs-panel {
border: 1px solid #eeeeee;
border-radius: 4px;
padding: 10px;
margin-bottom: 30px;
overflow: hidden;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
padding: 8px;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-nav {
padding-left: 4px;
}
.admin-interface .inline-group .tabular tr td {
vertical-align: bottom;
}
.admin-interface .inline-group .tabular tr.has_original td.original,
.admin-interface .inline-group .tabular tr td.delete {
vertical-align: top;
}
.admin-interface .inline-group .tabular .datetime > input {
margin-right: 5px;
}
.admin-interface .inline-group .tabular .datetime br {
display: none;
}
.admin-interface #changelist .row1:not(.selected):hover,
.admin-interface #changelist .row2:not(.selected):hover {
background: #f9f9f9;
}
.admin-interface .row2 {
background: #fcfcfc;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
background-color: #f5f5f5;
border: 1px solid #ebebeb;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
background-color: #fcfcfc;
border-bottom: 1px solid #fcfcfc;
}
@@ -1,65 +1,17 @@
/* /*
django-modeltranslation support django-modeltranslation support
https://github.com/deschler/django-modeltranslation/pull/313/commits https://github.com/deschler/django-modeltranslation
*/ */
.admin-interface #content h1 select { .admin-interface #content h1 select {
text-transform:uppercase; text-transform: uppercase;
margin-left:15px; margin-left: 15px;
min-width: 50px;
} }
.admin-interface .ui-tabs .ui-tabs-nav { .admin-interface .ui-tabs .ui-tabs-panel[id^=tab_id_] {
padding:10px 0 0 10px; border: none;
border-top: 1px solid #eeeeee;
padding: 0;
margin-bottom: 0;
} }
.admin-interface .ui-tabs .ui-tabs-nav li {
margin-left:-1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li a {
outline:none;
background-color:#f8f8f8;
border:1px solid #eeeeee;
border-bottom:none;
text-transform:uppercase;
padding:7px 14px 8px 14px;
margin-top:1px;
}
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
padding:8px 14px 8px 14px;
margin-top:0px;
margin-bottom:-1px;
font-weight: bold;
background-color:#FFFFFF;
color:{{ theme.css_module_background_color }};
border-bottom:1px solid #FFFFFF;
}
.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
padding:8px;
}
.admin-interface #changelist .row1:not(.selected):hover,
.admin-interface #changelist .row2:not(.selected):hover {
background:#f9f9f9;
}
.admin-interface .row2 {
background:#fcfcfc;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
background-color:#f5f5f5;
border:1px solid #ebebeb;
}
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
background-color:#fcfcfc;
border-bottom:1px solid #fcfcfc;
}
@@ -0,0 +1,37 @@
/*
django-tabbed-admin support
https://github.com/omji/django-tabbed-admin
*/
/* Hide tabs until ready */
/*
.admin-interface #tabs ul {
display: none;
}
.admin-interface #tabs ul.ui-tabs-nav {
display: block;
}
*/
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child {
margin-bottom: 0;
}
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child .form-row:last-child {
border-bottom: none;
}
@media (max-width: 350px){
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .vTextField,
.admin-interface .inline-related .vTextField {
width: 17em;
}
}
@media (max-width: 767px){
/* fix horizontal overflow - responsive.css:563 */
.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .aligned .form-row > div:not([class]) {
width: 100% !important;
}
}
@@ -1,21 +1,20 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django import template from django import template, VERSION
from admin_interface.models import Theme from admin_interface.models import Theme
from admin_interface.version import __version__ from admin_interface.version import __version__
register = template.Library() register = template.Library()
try: if VERSION < (1, 9):
assignment_tag = register.assignment_tag simple_tag = register.assignment_tag
except AttributeError: else:
assignment_tag = register.simple_tag simple_tag = register.simple_tag
@assignment_tag(takes_context=True) @simple_tag(takes_context=True)
def get_admin_interface_theme(context): def get_admin_interface_theme(context):
theme = None theme = None
request = context.get('request', None) request = context.get('request', None)
@@ -31,6 +30,6 @@ def get_admin_interface_theme(context):
return theme return theme
@assignment_tag(takes_context=False) @simple_tag(takes_context=False)
def get_admin_interface_version(): def get_admin_interface_version():
return __version__ return __version__
+1 -1
View File
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = '0.5.8' __version__ = '0.6.3'
+6 -4
View File
@@ -4,18 +4,19 @@
from setuptools import find_packages, setup from setuptools import find_packages, setup
import os import os
# import pypandoc
exec(open('admin_interface/version.py').read()) exec(open('admin_interface/version.py').read())
github_url = 'https://github.com/fabiocaccamo' github_url = 'https://github.com/fabiocaccamo'
package_name = 'django-admin-interface' package_name = 'django-admin-interface'
package_path = os.path.abspath(os.path.dirname(__file__)) package_path = os.path.abspath(os.path.dirname(__file__))
# long_description = pypandoc.convert(os.path.join(package_path, 'README.md'), 'rst')
long_description_file_path = os.path.join(package_path, 'README.rst') long_description_file_path = os.path.join(package_path, 'README.rst')
long_description = '' long_description = ''
with open(long_description_file_path) as f: try:
long_description = f.read() with open(long_description_file_path) as f:
long_description = f.read()
except IOError:
pass
setup( setup(
name=package_name, name=package_name,
@@ -44,6 +45,7 @@ setup(
'Framework :: Django :: 1.9', 'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10', 'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11', 'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Natural Language :: English', 'Natural Language :: English',
+5 -4
View File
@@ -1,9 +1,9 @@
[tox] [tox]
envlist = envlist =
py27-{17,18,19,110,111}, py27-{17,18,19,110,111},
py34-{17,18,19,110,111,master}, py34-{17,18,19,110,111,20,master},
py35-{18,19,110,111,master}, py35-{18,19,110,111,20,master},
py36-{18,19,110,111,master}, py36-{18,19,110,111,20,master},
[testenv] [testenv]
passenv = CI TRAVIS TRAVIS_* passenv = CI TRAVIS TRAVIS_*
deps = deps =
@@ -12,10 +12,11 @@ deps =
19: Django >= 1.9, < 1.10 19: Django >= 1.9, < 1.10
110: Django >= 1.10, < 1.11 110: Django >= 1.10, < 1.11
111: Django >= 1.11, < 1.12 111: Django >= 1.11, < 1.12
20: Django >= 2.0, < 2.1
master: https://github.com/django/django/archive/master.tar.gz master: https://github.com/django/django/archive/master.tar.gz
coverage coverage
codecov codecov
commands = commands =
coverage run --append --source=admin_interface setup.py test coverage run --append --source=admin_interface setup.py test
coverage report -m coverage report -m
codecov codecov