diff --git a/docs/conf.py b/docs/conf.py index 659a4bf..5c112ab 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. @@ -40,7 +40,7 @@ source_suffix = '.rst' # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = 'utf-8-sig' # The master toctree document. master_doc = 'index' @@ -60,37 +60,37 @@ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -#today = '' +# today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. exclude_patterns = ['_build'] # The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None +# default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] +# modindex_common_prefix = [] # -- Options for HTML output --------------------------------------------------- @@ -102,26 +102,26 @@ # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -#html_theme_options = {} +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +# html_theme_path = [] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -130,44 +130,44 @@ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Output file base name for HTML help builder. htmlhelp_basename = 'django-fluent-dashboarddoc' @@ -177,13 +177,13 @@ latex_elements = { # The paper size ('letterpaper' or 'a4paper'). - #'papersize': 'letterpaper', + # 'papersize': 'letterpaper', # The font size ('10pt', '11pt' or '12pt'). - #'pointsize': '10pt', + # 'pointsize': '10pt', # Additional stuff for the LaTeX preamble. - #'preamble': '', + # 'preamble': '', } # Grouping the document tree into LaTeX files. List of tuples @@ -195,23 +195,23 @@ # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output -------------------------------------------- @@ -224,7 +224,7 @@ ] # If true, show URL addresses after external links. -#man_show_urls = False +# man_show_urls = False # -- Options for Texinfo output ------------------------------------------------ @@ -239,13 +239,13 @@ ] # Documents to append as an appendix to all manuals. -#texinfo_appendices = [] +# texinfo_appendices = [] # If false, no module index is generated. -#texinfo_domain_indices = True +# texinfo_domain_indices = True # How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' +# texinfo_show_urls = 'footnote' # Example configuration for intersphinx: refer to the Python standard library. diff --git a/fluent_dashboard/appsettings.py b/fluent_dashboard/appsettings.py index df10391..bf727b4 100644 --- a/fluent_dashboard/appsettings.py +++ b/fluent_dashboard/appsettings.py @@ -112,7 +112,8 @@ FLUENT_DASHBOARD_APP_ICONS.update(getattr(settings, 'FLUENT_DASHBOARD_APP_ICONS', {})) -FLUENT_DASHBOARD_DEFAULT_MODULE = getattr(settings, 'FLUENT_DASHBOARD_DEFAULT_MODULE', 'admin_tools.dashboard.modules.AppList') +FLUENT_DASHBOARD_DEFAULT_MODULE = getattr(settings, 'FLUENT_DASHBOARD_DEFAULT_MODULE', + 'admin_tools.dashboard.modules.AppList') FLUENT_DASHBOARD_APP_GROUPS = getattr(settings, 'FLUENT_DASHBOARD_APP_GROUPS', ( (_('CMS'), { @@ -176,7 +177,7 @@ 'module': FLUENT_DASHBOARD_DEFAULT_MODULE, 'collapsible': False, }), - #(_('Developer tools'), ()), + # (_('Developer tools'), ()), )) diff --git a/fluent_dashboard/dashboard.py b/fluent_dashboard/dashboard.py index e9c9f11..7b3bdc2 100644 --- a/fluent_dashboard/dashboard.py +++ b/fluent_dashboard/dashboard.py @@ -11,7 +11,6 @@ """ from distutils.version import LooseVersion import admin_tools -from admin_tools.dashboard.modules import Group from django.conf import settings from django.utils.translation import ugettext_lazy as _ @@ -116,7 +115,7 @@ def get_rss_modules(self): Instantiate the RSS modules for use in the dashboard. This module displays the RSS feeds of the :ref:`dashboardmods` package, if it is installed, and configured. """ - if not 'dashboardmods' in settings.INSTALLED_APPS: + if 'dashboardmods' not in settings.INSTALLED_APPS: return [] import dashboardmods return dashboardmods.get_rss_dash_modules() diff --git a/fluent_dashboard/items.py b/fluent_dashboard/items.py index 8c5c225..5969a9c 100644 --- a/fluent_dashboard/items.py +++ b/fluent_dashboard/items.py @@ -56,7 +56,8 @@ def is_item_visible(self, model, perms): This function can be extended to support "view permissions" for example. :param model: The model class - :param perms: The permissions from :func:`ModelAdmin.get_model_perms()`. + :param perms: The permissions from + :func:`ModelAdmin.get_model_perms()`. """ return perms['change'] diff --git a/fluent_dashboard/modules.py b/fluent_dashboard/modules.py index 6d0a9e9..90ff305 100644 --- a/fluent_dashboard/modules.py +++ b/fluent_dashboard/modules.py @@ -84,9 +84,12 @@ def init_with_context(self, context): app_label, model_name = self.cms_page_model model = apps.get_model(app_label, model_name) pages_title = model._meta.verbose_name_plural.lower() - pages_link = reverse('{site}:{app}_{model}_changelist'.format(site=site_name, app=app_label.lower(), model=model_name.lower())) + pages_link = reverse('{site}:{app}_{model}_changelist'.format(site=site_name, app=app_label.lower(), + model=model_name.lower())) except AttributeError: - raise ImproperlyConfigured("The value {0} of FLUENT_DASHBOARD_CMS_PAGE_MODEL setting (or cms_page_model value) does not reffer to an existing model.".format(self.cms_page_model)) + raise ImproperlyConfigured("The value {0} of FLUENT_DASHBOARD_CMS_PAGE_MODEL setting " + "(or cms_page_model value) does not reffer to an existing model.". + format(self.cms_page_model)) except NoReverseMatch: pass else: @@ -140,7 +143,8 @@ def init_with_context(self, context): try: model_name = self._get_model_name(model) model['name'] = model_name - model['icon'] = self.get_icon_for_model(app_name, model_name) or appsettings.FLUENT_DASHBOARD_DEFAULT_ICON + model['icon'] = self.get_icon_for_model(app_name, model_name) or appsettings.\ + FLUENT_DASHBOARD_DEFAULT_ICON except ValueError: model['icon'] = appsettings.FLUENT_DASHBOARD_DEFAULT_ICON