Updated version

README.md

@@ -13,7 +13,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
 - 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`
 
 ## Requirements
@@ -41,7 +41,7 @@ INSTALLED_APPS = (
 
 #### Upgrade
 - Run `pip install django-admin-interface --upgrade`
-- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
 - Run ``python manage.py collectstatic --clear``
 - Restart your application server
 
@@ -51,10 +51,10 @@ This package ships with optional themes as fixtures, they can be installed using
 ##### [Django](https://www.djangoproject.com/) theme (default):
 Run ``python manage.py loaddata admin_interface_theme_django.json``
 
-##### [Bootstrap](http://getbootstrap.com/) theme: 
+##### [Bootstrap](http://getbootstrap.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
 
-##### [Foundation](http://foundation.zurb.com/) theme: 
+##### [Foundation](http://foundation.zurb.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_foundation.json``
 
 ##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
@@ -63,10 +63,10 @@ Run ``python manage.py loaddata admin_interface_theme_uswds.json``
 ### Add more themes
 You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
 
-1. Export your exact theme as fixture using the `dumpdata` admin command: 
+1. Export your exact theme as fixture using the `dumpdata` admin command:
 ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
 
-2. Copy the generated json file into the fixtures folder *(making sure its name starts with `admin_interface_theme_` to avoid clashes with fixtures that might be provided by other third party apps)*.
+2. Copy the generated json file into the fixtures folder *(making sure its name starts with* `admin_interface_theme_` *to avoid clashes with fixtures that might be provided by other third party apps)*.
 
 3. Remove the `"pk"` from the fixture and make sure the `active` field is set to `true` *(in this way a theme is automatically activated when installed)*.
 
@@ -88,13 +88,9 @@ You can add a theme you've created through the admin to this repository by [send
 ## FAQ
 - #### I already have a custom `base_site.html`, how can I make it work?
 
-You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add **`{% extends "admin_interface:admin/base_site.html" %}`** to your `base_site.html`
+You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
 
 ---
-#### Thanks
-- [django-flat-theme](https://github.com/elky/django-flat-theme/)
-- [django-flat-responsive](https://github.com/elky/django-flat-responsive)
-- [django-colorfield](https://github.com/jaredly/django-colorfield/)
 
 ## License
 Released under [MIT License](LICENSE).

README.rst

@@ -0,0 +1,142 @@
+|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|
+
+django-admin-interface
+======================
+
+django-admin-interface is a modern **responsive flat admin interface
+customizable by the admin itself**.
+
+Features
+--------
+
+- Beautiful default **django-theme**
+- Themes management and customization *(you can customize admin title, logo and colors)*
+- Responsive
+- List filter dropdown *(optional)*
+- ``NEW`` **Related modal** (instead of the old popup window, optional)
+- Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail``
+
+Requirements
+------------
+
+- Python 2.7, 3.4, 3.5, 3.6
+- Django 1.7, 1.8, 1.9, 1.10, 1.11
+
+Installation
+------------
+
+- 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``
+- Run ``python manage.py migrate``
+- Run ``python manage.py collectstatic``
+- Restart your application server
+
+Upgrade
+^^^^^^^
+
+- Run ``pip install django-admin-interface --upgrade``
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py collectstatic --clear``
+- Restart your application server
+
+Optional themes
+^^^^^^^^^^^^^^^
+
+This package ships with optional themes as fixtures, they can be
+installed using the ``loaddata`` admin command.
+Optional themes are activated on installation.
+
+**Django theme** (default):
+
+Run ``python manage.py loaddata admin_interface_theme_django.json``
+
+**Bootstrap theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
+
+**Foundation theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_foundation.json``
+
+**U.S. Web Design Standards theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_uswds.json``
+
+Add more themes
+^^^^^^^^^^^^^^^
+
+You can add a theme you've created through the admin to this repository
+by **sending us a PR**. Here are the steps to follow to add:
+
+1. Export your exact theme as fixture using the ``dumpdata`` admin command:
+``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
+
+2. Copy the generated json file into the fixtures folder *(making sure
+its name starts with ``admin_interface_theme_`` to avoid clashes with
+fixtures that might be provided by other third party apps)*.
+
+3. Remove the ``pk`` from the fixture and make sure the ``active``
+field is set to ``true`` *(in this way a theme is automatically
+activated when installed)*.
+
+4. Edit the section above to document your theme.
+
+Screenshots
+-----------
+
+Admin login
+
+
+|django-admin-interface_login|
+-------------------------------
+
+Admin dashboard
+
+
+|django-admin-interface_dashboard|
+-----------------------------------
+
+Admin themes management
+
+
+|django-admin-interface_themes_management|
+--------------------------------------------
+
+Admin theme customization
+
+
+|django-admin-interface_theme_customization|
+---------------------------------------------
+
+FAQ
+---
+
+**I already have a custom** ``base_site.html`` **, how can I make it work?**
+
+You can use ``django-apptemplates`, then add ``{% extends "admin_interface:admin/base_site.html" %}`` to your ``base_site.html``
+
+License
+-------
+
+Released under **MIT License**.
+
+
+.. |Build Status| image:: https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master
+
+.. |codecov| image:: https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg
+
+.. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat
+
+.. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg
+
+.. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg
+
+.. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
+
+.. |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_themes_management| image:: https://cloud.githubusercontent.com/assets/1035294/11240245/6cd1c342-8df1-11e5-928b-f22217474d3d.gif
+
+.. |django-admin-interface_theme_customization| image:: https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif

admin_interface/templates/admin_interface/css/admin-interface-fix.css

@@ -181,6 +181,11 @@ body.admin-interface .paginator a.showall:visited {
         width: auto;
         padding: 0px;
     }
+
+    /* fix inline horizontal scroll caused by checkbox-row */
+    .admin-interface form .form-row > div.checkbox-row {
+        width: 100%;
+    }
 }
 
 
@@ -265,13 +270,22 @@ body.admin-interface .paginator a.showall:visited {
     text-align:right;
 }
 
+.admin-interface .inline-group .tabular tr td {
+    vertical-align: top;
+}
+
 .admin-interface .inline-group .tabular tr td.delete {
     text-align:right;
     padding-right:15px;
+    vertical-align: top;
+}
+
+.admin-interface .inline-group .tabular tr td input[type="checkbox"] {
+    margin: 7px 0px;
 }
 
 .admin-interface .inline-group .tabular tr td.delete a.inline-deletelink {
-    margin-top:2px;
+    margin-top:4px;
     overflow:hidden;
     text-indent:9999px;
 }
@@ -297,57 +311,76 @@ body.admin-interface .paginator a.showall:visited {
 }
 
 /* improve responsive selector */
-.admin-interface .selector.stacked {
-    width: 480px;
+
+/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector (stacked and not) */
+.admin-interface .selector .selector-available select,
+.admin-interface .selector .selector-chosen select {
+    padding: 7px 10px;
+    display: block;
+}
+
+/* fix [not-stacked] selector */
+.admin-interface .selector:not(.stacked) {
+    width: auto;
     margin-right: 10px;
 }
 
-.admin-interface .selector.stacked .selector-chooser {
-    margin-left: calc(50% - 25px);
-}
-
-@media (min-width: 767px) and (max-width: 1124px){
-    .admin-interface .selector {
-        width: 610px;
-        display: block;
-    }
-    .admin-interface .selector .selector-available,
-    .admin-interface .selector .selector-chosen {
-        width: 285px;
-        flex: 0 1 auto;
-    }
-    .admin-interface .selector .selector-filter {
-        display: flex;
-        align-items: center;
-    }
-    .admin-interface .selector .selector-filter label {
-        margin: 0;
-    }
-    .admin-interface .selector .selector-available input {
-        width: auto;
-        flex: 1 1;
-    }
-    .admin-interface .selector select {
-        width: 100%;
-    }
-}
-
-@media (max-width: 767px){
-    .admin-interface .selector.stacked {
-        margin-right: 0px;
-    }
-    .admin-interface .selector.stacked .selector-available select {
-        margin-bottom: 0px;
-    }
-}
-
-/* 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 {
     height: calc(46px + 17.2em) !important;
 }
 
-/* equalize horizontal and vertical select padding */
-.admin-interface .selector .selector-available select,
-.admin-interface .selector .selector-chosen select {
-    padding: 7px 10px;
+@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);
 }

admin_interface/templates/admin_interface/css/ckeditor.css

@@ -97,10 +97,7 @@ https://github.com/Ikimea/ckeditor-light-theme
 
 @media (max-width: 767px){
 
-    .django-ckeditor-widget {
-        width: 100% !important;
-    }
-
+    .admin-interface .django-ckeditor-widget,
     .admin-interface .cke {
         width: 100% !important;
     }
@@ -117,4 +114,13 @@ https://github.com/Ikimea/ckeditor-light-theme
     .admin-interface .cke_contents {
         height: auto;
     }
+
+    .admin-interface .tabular .django-ckeditor-widget,
+    .admin-interface .tabular .cke {
+        width: 400px !important;
+    }
+
+    .admin-interface .tabular .cke_contents {
+        height: 90px !important;
+    }
 }

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.5.5'
+__version__ = '0.5.8'

setup.py

@@ -4,14 +4,18 @@
 from setuptools import find_packages, setup
 
 import os
-import pypandoc
+# import pypandoc
 
 exec(open('admin_interface/version.py').read())
 
 github_url = 'https://github.com/fabiocaccamo'
 package_name = 'django-admin-interface'
 package_path = os.path.abspath(os.path.dirname(__file__))
-long_description = pypandoc.convert(os.path.join(package_path, 'README.md'), 'rst')
+# 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 = ''
+with open(long_description_file_path) as f:
+    long_description = f.read()
 
 setup(
     name=package_name,