Fix login and dashboard for display on mobiles

This commit is contained in:
ErikKalkoken 2020-02-15 20:10:30 +01:00
parent 564a25e578
commit 9976ecc2aa
4 changed files with 112 additions and 43 deletions

View File

@ -10,10 +10,12 @@
{% include 'allianceauth/admin-status/include.html' %} {% include 'allianceauth/admin-status/include.html' %}
{% endif %} {% endif %}
<div class="col-sm-12"> <div class="col-sm-12">
<div class="row vertical-flexbox-row"> <div class="row vertical-flexbox-row2">
<div class="col-sm-6 text-center"> <div class="col-sm-6 text-center">
<div class="panel panel-primary" style="height:100%"> <div class="panel panel-primary" style="height:100%">
<div class="panel-heading"><h3 class="panel-title">{% trans "Main Character" %}</h3></div> <div class="panel-heading">
<h3 class="panel-title">{% trans "Main Character" %}</h3>
</div>
<div class="panel-body"> <div class="panel-body">
{% if request.user.profile.main_character %} {% if request.user.profile.main_character %}
{% with request.user.profile.main_character as main %} {% with request.user.profile.main_character as main %}
@ -25,12 +27,21 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="text-center">{{ main.character_name }}</td> <td class="text-center">
<span class="hidden-xs">
{{ main.character_name }}
</span>
<span class="visible-xs-block">
<strong>{{ main.character_name }}</strong><br>
{{ main.corporation_name }}<br>
{{ main.alliance_name }}
</span>
</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-lg-4 col-sm-2"> <div class="col-lg-4 col-sm-2">
<table class="table"> <table class="table hidden-xs">
<tr> <tr>
<td class="text-center"> <td class="text-center">
<img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}"> <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
@ -43,7 +54,7 @@
</div> </div>
<div class="col-lg-4 col-sm-2"> <div class="col-lg-4 col-sm-2">
{% if main.alliance_id %} {% if main.alliance_id %}
<table class="table"> <table class="table hidden-xs">
<tr> <tr>
<td class="text-center"> <td class="text-center">
<img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}"> <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
@ -60,20 +71,24 @@
<div class="alert alert-danger" role="alert">{% trans "No main character set." %}</div> <div class="alert alert-danger" role="alert">{% trans "No main character set." %}</div>
{% endif %} {% endif %}
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="col-xs-6"> <div class="row">
<a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info" <div class="col-sm-6 button-wrapper">
title="Add Character">{% trans 'Add Character' %}</a> <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
</div> title="Add Character">{% trans 'Add Character' %}</a>
<div class="col-xs-6"> </div>
<a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info" <div class="col-sm-6 button-wrapper">
title="Change Main Character">{% trans "Change Main" %}</a> <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
title="Change Main Character">{% trans "Change Main" %}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6 text-center"> <div class="col-sm-6 text-center">
<div class="panel panel-success" style="height:100%"> <div class="panel panel-success" style="height:100%">
<div class="panel-heading"><h3 class="panel-title">{% trans "Groups" %}</h3></div> <div class="panel-heading">
<h3 class="panel-title">{% trans "Groups" %}</h3>
</div>
<div class="panel-body"> <div class="panel-body">
<div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;"> <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
<table class="table table-striped"> <table class="table table-striped">
@ -90,26 +105,52 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" style="display:flex;"><h3 class="panel-title">{% trans 'Characters' %}</h3></div> <div class="panel-heading">
<div class="panel-body"> <h3 class="panel-title text-center" style="text-align: center">
<table class="table table-hover"> {% trans 'Characters' %}
<tr> </h3>
<th class="text-center"></th> </div>
<th class="text-center">{% trans 'Name' %}</th> <div class="panel-body">
<th class="text-center">{% trans 'Corp' %}</th> <table class="table table-striped hidden-xs">
<th class="text-center">{% trans 'Alliance' %}</th> <thead>
</tr> <tr>
{% for ownership in request.user.character_ownerships.all %} <th class="text-center"></th>
{% with ownership.character as char %} <th class="text-center">{% trans 'Name' %}</th>
<tr> <th class="text-center">{% trans 'Corp' %}</th>
<td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}"> <th class="text-center">{% trans 'Alliance' %}</th>
</td> </tr>
<td class="text-center">{{ char.character_name }}</td> </thead>
<td class="text-center">{{ char.corporation_name }}</td> <tbody>
<td class="text-center">{{ char.alliance_name }}</td> {% for ownership in request.user.character_ownerships.all %}
</tr> {% with ownership.character as char %}
{% endwith %} <tr>
{% endfor %} <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
</td>
<td class="text-center">{{ char.character_name }}</td>
<td class="text-center">{{ char.corporation_name }}</td>
<td class="text-center">{{ char.alliance_name }}</td>
</tr>
{% endwith %}
{% endfor %}
</tbody>
</table>
<table class="table table-striped visible-xs-block" style="width: 100%">
<tbody>
{% for ownership in request.user.character_ownerships.all %}
{% with ownership.character as char %}
<tr>
<td class="text-center" style="vertical-align: middle">
<img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
</td>
<td class="text-center" style="vertical-align: middle; width: 100%">
<strong>{{ char.character_name }}</strong><br>
{{ char.corporation_name }}<br>
{{ char.alliance_name|default:"" }}
</td>
</tr>
{% endwith %}
{% endfor %}
</tbody>
</table> </table>
</div> </div>
</div> </div>

View File

@ -3,8 +3,8 @@
{% block page_title %}Login{% endblock %} {% block page_title %}Login{% endblock %}
{% block middle_box_content %} {% block middle_box_content %}
<p style="text-align:center"> <p style="text-align:center">
<a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}"> <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
<img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0> <img class="img-responsive" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
</a> </a>
</p> </p>
{% endblock %} {% endblock %}

View File

@ -42,3 +42,28 @@ ul.list-group.list-group-horizontal > li.list-group-item {
.flex-center-horizontal { .flex-center-horizontal {
justify-content: center; justify-content: center;
} }
/* Small devices (tablets, 768px and up) */
@media (min-width: 768px) {
/* class for vertically aligning columns in a bootstrap row */
.row.vertical-flexbox-row2 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
flex-wrap: wrap;
}
.row.vertical-flexbox-row2 > [class*='col-'] {
display: flex;
flex-direction: column;
}
}
/* Extra Small devices (Phones, <768px) */
@media (max-width: 767px) {
.button-wrapper .btn {
margin-bottom:5px;
}
}

View File

@ -1,6 +1,6 @@
{% load i18n %} {% load i18n %}
<div class="col-sm-12"> <div class="col-sm-12">
<div class="row vertical-flexbox-row"> <div class="row vertical-flexbox-row2">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-primary" style="height:100%;position:relative;"> <div class="panel panel-primary" style="height:100%;position:relative;">
<div class="panel-heading text-center"><h3 class="panel-title">{% trans "Alliance Auth Notifications" %}</h3></div> <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Alliance Auth Notifications" %}</h3></div>
@ -31,33 +31,36 @@
<div class="panel-body flex-center-horizontal"> <div class="panel-body flex-center-horizontal">
<ul class="list-group list-group-horizontal" style="margin-bottom: 0;"> <ul class="list-group list-group-horizontal" style="margin-bottom: 0;">
<li class="list-group-item"> <li class="list-group-item">
<h4 class="list-group-item-heading">{% trans "Current" %}</h4> <h5 class="list-group-item-heading">{% trans "Current" %}</h5>
<p class="list-group-item-text"> <p class="list-group-item-text">
{{ current_version }} {{ current_version }}
</p> </p>
</li> </li>
<li class="list-group-item list-group-item-{% if latest_major %}success{% else %}warning{% endif %}"> <li class="list-group-item list-group-item-{% if latest_major %}success{% else %}warning{% endif %}">
<h4 class="list-group-item-heading">{% trans "Latest Major" %}</h4> <h5 class="list-group-item-heading">{% trans "Latest Major" %}</h5>
<p class="list-group-item-text"> <p class="list-group-item-text">
<a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i> <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
<i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
{{ latest_major_version }} {{ latest_major_version }}
</a> </a>
{% if not latest_major %}<br>{% trans "Update available" %}{% endif %} {% if not latest_major %}<br>{% trans "Update available" %}{% endif %}
</p> </p>
</li> </li>
<li class="list-group-item list-group-item-{% if latest_minor %}success{% else %}warning{% endif %}"> <li class="list-group-item list-group-item-{% if latest_minor %}success{% else %}warning{% endif %}">
<h4 class="list-group-item-heading">{% trans "Latest Minor" %}</h4> <h5 class="list-group-item-heading">{% trans "Latest Minor" %}</h5>
<p class="list-group-item-text"> <p class="list-group-item-text">
<a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i> <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
<i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
{{ latest_minor_version }} {{ latest_minor_version }}
</a> </a>
{% if not latest_minor %}<br>{% trans "Update available" %}{% endif %} {% if not latest_minor %}<br>{% trans "Update available" %}{% endif %}
</p> </p>
</li> </li>
<li class="list-group-item list-group-item-{% if latest_patch %}success{% else %}danger{% endif %}"> <li class="list-group-item list-group-item-{% if latest_patch %}success{% else %}danger{% endif %}">
<h4 class="list-group-item-heading">{% trans "Latest Patch" %}</h4> <h5 class="list-group-item-heading">{% trans "Latest Patch" %}</h5>
<p class="list-group-item-text"> <p class="list-group-item-text">
<a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i> <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
<i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
{{ latest_patch_version }} {{ latest_patch_version }}
</a> </a>
{% if not latest_patch %}<br>{% trans "Update available" %}{% endif %} {% if not latest_patch %}<br>{% trans "Update available" %}{% endif %}