Skip to content

Commit 097db03

Browse files
dennissiemensmadennissiemensma
committed
Layout verbeteren #912 
1 parent 4b0d8b9 commit 097db03

9 files changed

+24
-29
lines changed

‎dsmr_frontend/templates/dsmr_frontend/archive.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% load i18n %}
44

55
{% block title %}{% trans "Archive" %}{% endblock %}
6-
{% block header %}{% trans "Archive" %} &nbsp; <i class="fas fa-clock"></i>{% endblock %}
6+
{% block header %}{% trans "Archive" %} &nbsp; <i class="fas fa-history"></i>{% endblock %}
77

88
{% block content %}
99
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/base.html

+15-20
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@
7070
</li>
7171
<li>
7272
<a href="{% url 'frontend:live-graphs' %}">
73-
<i class="fas fa-chart-line"></i> &nbsp; <span>{% trans "Live graphs" %}</span>
73+
<i class="fas fa-chart-bar"></i> &nbsp; <span>{% trans "Live graphs" %}</span>
7474
</a>
7575
</li>
7676
<li>
7777
<a href="{% url 'frontend:archive' %}">
78-
<i class="fas fa-clock"></i> &nbsp; <span>{% trans "Archive" %}</span>
78+
<i class="fas fa-history"></i> &nbsp; <span>{% trans "Archive" %}</span>
7979
</a>
8080
</li>
8181
<li>
8282
<a href="{% url 'frontend:compare' %}">
83-
<i class="fas fa-balance-scale"></i> &nbsp; <span>{% trans "Compare" %}</span>
83+
<i class="fas fa-balance-scale-left"></i> &nbsp; <span>{% trans "Compare" %}</span>
8484
</a>
8585
</li>
8686
<li>
8787
<a href="{% url 'frontend:trends' %}">
88-
<i class="fas fa-chart-bar"></i> &nbsp; <span>{% trans "Trends" %}</span>
88+
<i class="fas fa-chart-pie"></i> &nbsp; <span>{% trans "Trends" %}</span>
8989
</a>
9090
</li>
9191
<li>
@@ -95,7 +95,7 @@
9595
</li>
9696
<li>
9797
<a href="{% url 'frontend:energy-contracts' %}">
98-
<i class="fas fa-newspaper"></i> &nbsp; <span>{% trans "Energy contracts" %}</span>
98+
<i class="fas fa-euro-sign"></i> &nbsp; <span>{% trans "Energy contracts" %}</span>
9999
</a>
100100
</li>
101101
<li>
@@ -106,27 +106,22 @@
106106
<i class="fas fa-heartbeat"></i> &nbsp; <span>{% trans "Status" %}</span>
107107
</a>
108108
</li>
109-
<li>
110-
<a href="{% url 'frontend:notifications' %}">
111-
<i class="far fa-bell"></i> &nbsp; <small>{% trans "Notifications" %} &nbsp; <i class="fas fa-lock" title="{% trans 'Authentication required' %}"></i></small>
112-
</a>
113-
</li>
114109
<li>
115110
<a href="{% url 'frontend:export' %}">
116-
<i class="fas fa-xs fa-file-download"></i> &nbsp; <small>{% trans "Export data" %} &nbsp; <i class="fas fa-lock" title="{% trans 'Authentication required' %}"></i></small>
111+
<i class="fas fa-xs fa-file-excel"></i> &nbsp; <small>{% trans "Export data" %} &nbsp; <i class="fas fa-lock" title="{% trans 'Authentication required' %}"></i></small>
117112
</a>
118113
</li>
119114
<li>
120115
<a href="{% url 'frontend:configuration' %}">
121-
<i class="fas fa-xs fa-sliders-h"></i> &nbsp; <small>{% trans "Configuration" %} &nbsp; <i class="fas fa-lock" title="{% trans 'Authentication required' %}"></i></small>
116+
<i class="fas fa-xs fa-wrench"></i> &nbsp; <small>{% trans "Configuration" %} &nbsp; <i class="fas fa-lock" title="{% trans 'Authentication required' %}"></i></small>
122117
</a>
123118
</li>
124119
<li>
125120
&nbsp;
126121
</li>
127122
<li>
128123
<a href="{% url 'frontend:changelog-redirect' %}" target="_blank">
129-
<i class="fas fa-xs fa-history"></i> &nbsp; <small>{% trans "Changelog" %}</small>
124+
<i class="fas fa-xs fa-info"></i> &nbsp; <small>{% trans "Changelog" %}</small>
130125
</a>
131126
</li>
132127
<li>
@@ -136,19 +131,14 @@
136131
</li>
137132
<li>
138133
<a href="{% url 'frontend:api-docs' %}" target="_blank">
139-
<i class="fas fa-xs fa-file-code"></i> &nbsp; <small>{% trans "API docs" %}</small>
134+
<i class="fas fa-xs fa-robot"></i> &nbsp; <small>{% trans "API docs" %}</small>
140135
</a>
141136
</li>
142137
<li>
143138
<a href="{% url 'frontend:feedback-redirect' %}" target="_blank">
144139
<i class="fas fa-xs fa-comments"></i> &nbsp; <small>{% trans "Feedback / bugs / ideas" %}</small>
145140
</a>
146141
</li>
147-
<li>
148-
<a href="https://dsmr-reader.readthedocs.io/{{ LANGUAGE_CODE }}/{{ DSMRREADER_MAIN_BRANCH }}/credits.html" target="_blank">
149-
<i class="fas fa-xs fa-heart"></i> &nbsp; <small>{% trans "Thanks to all the contributers" %}</small>
150-
</a>
151-
</li>
152142
<li>
153143
<a href="{% url 'frontend:donations-redirect' %}" target="_blank">
154144
<i class="fas fa-xs fa-hand-holding-usd"></i> &nbsp; <small>{% trans "Donations / tips" %}</small>
@@ -158,7 +148,12 @@
158148
&nbsp;
159149
</li>
160150
<li>
161-
<a href="https://nl.linkedin.com/in/dennissiemensma" target="_blank">
151+
<a href="https://dsmr-reader.readthedocs.io/{{ LANGUAGE_CODE }}/{{ DSMRREADER_MAIN_BRANCH }}/credits.html" target="_blank">
152+
<i class="fas fa-xs fa-heart"></i> &nbsp; <small>{% trans "Thanks to all the contributers" %}</small>
153+
</a>
154+
</li>
155+
<li>
156+
<a href="https://linkedin.com/in/dennissiemensma" target="_blank">
162157
<i class="far fa-xs fa-copyright"></i> &nbsp; <small>Dennis Siemensma 2015 - {% now "Y" %}</small>
163158
</a>
164159
</li>

‎dsmr_frontend/templates/dsmr_frontend/compare.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% load i18n %}
55

66
{% block title %}{% trans "Compare" %}{% endblock %}
7-
{% block header %}{% trans "Compare" %} &nbsp; <i class="fas fa-balance-scale"></i>{% endblock %}
7+
{% block header %}{% trans "Compare" %} &nbsp; <i class="fas fa-balance-scale-left"></i>{% endblock %}
88

99
{% block content %}
1010
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/configuration.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% load i18n %}
55

66
{% block title %}{% trans "Configuation" %}{% endblock %}
7-
{% block header %}{% trans "Configuation" %} &nbsp; <i class="fas fa-sliders-h"></i>{% endblock %}
7+
{% block header %}{% trans "Configuation" %} &nbsp; <i class="fas fa-wrench"></i>{% endblock %}
88

99
{% block content %}
1010
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/dashboard.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{{ consumption.day|date:django_date_format }}
4040
&nbsp;&nbsp;&nbsp;
4141
<div class="pull-right">
42-
<a class="btn btn-sm btn-primary" href="{% url 'frontend:live-graphs' %}"><i class="fas fa-chart-line"></i></a>
42+
<a class="btn btn-sm btn-primary" href="{% url 'frontend:live-graphs' %}"><i class="fas fa-chart-bar"></i></a>
4343
</header>
4444
<div class="panel-body">
4545
<table class="table table-hover">
@@ -121,7 +121,7 @@
121121
{% endif %}
122122

123123
<div class="pull-right">
124-
<a class="btn btn-sm btn-primary" href="{% url 'frontend:archive' %}"><i class="fas fa-chart-line"></i></a>
124+
<a class="btn btn-sm btn-primary" href="{% url 'frontend:archive' %}"><i class="fas fa-history"></i></a>
125125
</div>
126126
</header>
127127
<div class="panel-body">

‎dsmr_frontend/templates/dsmr_frontend/energy-contracts.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% load i18n %}
55

66
{% block title %}{% trans "Energy contracts" %}{% endblock %}
7-
{% block header %}{% trans "Energy contracts" %} &nbsp; <i class="fas fa-newspaper"></i>{% endblock %}
7+
{% block header %}{% trans "Energy contracts" %} &nbsp; <i class="fas fa-euro-sign"></i>{% endblock %}
88

99
{% block content %}
1010
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/export.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% load i18n %}
55

66
{% block title %}{% trans "Export data" %}{% endblock %}
7-
{% block header %}{% trans "Export data" %} &nbsp; <i class="fas fa-file-download"></i>{% endblock %}
7+
{% block header %}{% trans "Export data" %} &nbsp; <i class="fas fa-file-excel"></i>{% endblock %}
88

99
{% block content %}
1010
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/live-graphs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% load l10n %}
66

77
{% block title %}{% trans "Live graphs" %}{% endblock %}
8-
{% block header %}{% trans "Live graphs" %} &nbsp; <i class="fas fa-chart-line"></i>{% endblock %}
8+
{% block header %}{% trans "Live graphs" %} &nbsp; <i class="fas fa-chart-bar"></i>{% endblock %}
99

1010
{% block content %}
1111
<!-- Main content -->

‎dsmr_frontend/templates/dsmr_frontend/trends.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% load i18n %}
55

66
{% block title %}{% trans "Trends" %}{% endblock %}
7-
{% block header %}{% trans "Trends" %} &nbsp; <i class="fas fa-chart-bar"></i>{% endblock %}
7+
{% block header %}{% trans "Trends" %} &nbsp; <i class="fas fa-chart-pie"></i>{% endblock %}
88

99
{% block content %}
1010
<!-- Main content -->

0 commit comments

Comments
 (0)