diff --git a/allianceauth/project_template/project_name/settings/local.py b/allianceauth/project_template/project_name/settings/local.py index 1405fbd4..d83fd718 100644 --- a/allianceauth/project_template/project_name/settings/local.py +++ b/allianceauth/project_template/project_name/settings/local.py @@ -32,10 +32,13 @@ INSTALLED_APPS += [ # To change the logging level for extensions, uncomment the following line. # LOGGING['handlers']['extension_file']['level'] = 'DEBUG' -# By default apps are prevented from having public views for security reasons. -# If you want to allow specific apps to have public views -# you can put there names here (same name as in INSTALLED_APPS): -APPS_WITH_PUBLIC_VIEWS = [] +# By default, apps are prevented from having public views for security reasons. +# To allow specific apps to have public views, add them to APPS_WITH_PUBLIC_VIEWS +# » The format is the same as in INSTALLED_APPS +# » The app developer must also explicitly allow public views for their app +APPS_WITH_PUBLIC_VIEWS = [ + +] # Enter credentials to use MySQL/MariaDB. Comment out to use sqlite3 DATABASES['default'] = { diff --git a/allianceauth/static/allianceauth/css/auth-base.css b/allianceauth/static/allianceauth/css/auth-base.css index 6eb51d8e..b2b18aa5 100644 --- a/allianceauth/static/allianceauth/css/auth-base.css +++ b/allianceauth/static/allianceauth/css/auth-base.css @@ -122,7 +122,7 @@ ul.list-group.list-group-horizontal > li.list-group-item { padding-top: 0.5rem; } - .navbar-nav > li.top-user-menu.with-main-character a { + .navbar-nav > li.top-user-menu a { padding: 14px; } diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html index 2becf3c2..f82e7124 100644 --- a/allianceauth/templates/allianceauth/base.html +++ b/allianceauth/templates/allianceauth/base.html @@ -21,33 +21,37 @@ - {% if user.is_authenticated %} -
- - {% include 'allianceauth/top-menu.html' %} -
+
+ + {% include 'allianceauth/top-menu.html' %} + +
+ {% if user.is_authenticated %} {% include 'allianceauth/side-menu.html' %} -
- {% include 'allianceauth/messages.html' %} - {% block content %} - {% endblock content %} -
-
+ {% endif %} + +
+ {% include 'allianceauth/messages.html' %} + + {% block content %} + {% endblock content %}
- {% endif %} +
{% include 'bundles/bootstrap-js.html' %} {% include 'bundles/jquery-visibility-js.html' %} - - {% include 'bundles/refresh-notifications-js.html' %} + {% if user.is_authenticated %} + + {% include 'bundles/refresh-notifications-js.html' %} + {% endif %} {% include 'bundles/evetime-js.html' %} {% block extra_javascript %} diff --git a/allianceauth/templates/allianceauth/top-menu-user-dropdown.html b/allianceauth/templates/allianceauth/top-menu-user-dropdown.html index 2c9760be..99d29e5d 100644 --- a/allianceauth/templates/allianceauth/top-menu-user-dropdown.html +++ b/allianceauth/templates/allianceauth/top-menu-user-dropdown.html @@ -11,7 +11,10 @@ {% endwith %} {% else %} - {% translate "User Menu" %} + {{ main.character_name }} + {% endif %} diff --git a/allianceauth/templates/allianceauth/top-menu.html b/allianceauth/templates/allianceauth/top-menu.html index 2b501336..b09a1091 100644 --- a/allianceauth/templates/allianceauth/top-menu.html +++ b/allianceauth/templates/allianceauth/top-menu.html @@ -22,9 +22,12 @@
  • {% translate "Eve Time" %}:
    • - + + {% if user.is_authenticated %} + + {% endif %} {% include 'allianceauth/top-menu-user-dropdown.html' %}