From e68c840dadfff5c5c2b76baa941cdec6fcd5bcfe Mon Sep 17 00:00:00 2001 From: Basraah Date: Sat, 23 Sep 2017 18:03:43 +1000 Subject: [PATCH] CSS Fixes and cleanup Improves bootstrap compatibility, allowing for dropping in theme CSS. Also improves responsive design but still has a ways to go. --- .../templates/authentication/dashboard.html | 146 ++++++++++-------- .../authentication/templates/public/base.html | 2 +- .../templates/public/lang_select.html | 2 +- allianceauth/corputils/auth_hooks.py | 2 +- .../fleetactivitytracking/auth_hooks.py | 2 +- allianceauth/fleetup/auth_hooks.py | 2 +- allianceauth/hrapplications/auth_hooks.py | 2 +- allianceauth/optimer/auth_hooks.py | 2 +- allianceauth/permissions_tool/auth_hooks.py | 2 +- .../templates/permissions_tool/overview.html | 2 +- allianceauth/permissions_tool/tests.py | 2 +- allianceauth/services/auth_hooks.py | 2 +- .../services/modules/openfire/auth_hooks.py | 4 +- allianceauth/srp/auth_hooks.py | 2 +- allianceauth/static/css/auth-base.css | 25 ++- allianceauth/templates/allianceauth/base.html | 121 ++++++++------- .../templates/bundles/bootstrap-css.html | 2 +- allianceauth/timerboard/auth_hooks.py | 2 +- 18 files changed, 178 insertions(+), 146 deletions(-) diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html index 8800985a..950fe332 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.html +++ b/allianceauth/authentication/templates/authentication/dashboard.html @@ -5,71 +5,89 @@ {% block title %}{% trans "Dashboard" %}{% endblock %} {% block content %} -
-

{% trans "Dashboard" %}

-
-
-
-
-
{% trans "Main Character" %}
-
- {% if request.user.profile.main_character %} - {% with request.user.profile.main_character as main %} -
- - - -
{{ main.character_name }}
-
-
- - - -
{{ main.corporation_name }}
-
-
- {% if main.alliance_id %} - - - -
{{ main.alliance_name }}
- {% endif %} -
- {% endwith %} - {% else %} - +

{% trans "Dashboard" %}

+
+
+
+
+

{% trans "Main Character" %}

+
+ {% if request.user.profile.main_character %} + {% with request.user.profile.main_character as main %} +
+ + + + + + + +
+
{{ main.character_name }}
+
+
+ + + + + + + +
+
{{ main.corporation_name }}
+
+
+ {% if main.alliance_id %} + + + + + + + +
+
{{ main.alliance_name }}
{% endif %} -
- - +
+ {% endwith %} + {% else %} + + {% endif %} +
+ +
-
-
-
{% trans "Groups" %}
-
-
- - {% for group in user.groups.all %} - - - - {% endfor %} -
{{ group.name }}
-
+
+
+
+

{% trans "Groups" %}

+
+
+ + {% for group in user.groups.all %} + + + + {% endfor %} +
{{ group.name }}
-
+
-
{% trans 'Characters' %}
+

{% trans 'Characters' %}

@@ -79,14 +97,16 @@ {% for ownership in request.user.character_ownerships.all %} - {% with ownership.character as char %} - - - - - - - {% endwith %} + {% with ownership.character as char %} + + + + + + + {% endwith %} {% endfor %}
{% trans 'Alliance' %}
{{ char.character_name }}{{ char.corporation_name }}{{ char.alliance_name }}
+ {{ char.character_name }}{{ char.corporation_name }}{{ char.alliance_name }}
diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index 8bf077f4..1464ac91 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -32,7 +32,7 @@ } - #lang_select { + #lang-select { width: 40%; margin-left: auto; margin-right: auto; diff --git a/allianceauth/authentication/templates/public/lang_select.html b/allianceauth/authentication/templates/public/lang_select.html index 13d5ecfd..545d19ba 100644 --- a/allianceauth/authentication/templates/public/lang_select.html +++ b/allianceauth/authentication/templates/public/lang_select.html @@ -3,7 +3,7 @@
{% csrf_token %} - {% get_language_info_list for LANGUAGES as languages %} {% for language in languages %}