Skip to content

Commit 0a0b500

Browse files
Layout verbeteren #912
1 parent 9cfa699 commit 0a0b500

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

docs/changelog.rst

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ Changelog
22
=========
33

44

5+
v3.6.0 - 2020-xx-xx
6+
7+
- [`#912 <https://github.com/dennissiemensma/dsmr-reader/issues/912>`_] Layout verbeteren
8+
9+
10+
----
11+
12+
513
v3.5.0 - 2020-02-29
614

715
- [`#894 <https://github.com/dennissiemensma/dsmr-reader/issues/894>`_] Wijzigingen in datalogger terugdraaien

dsmr_frontend/static/dsmr_frontend/css/dsmr-reader/global.css

-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
display: none;
33
}
44

5-
div.copyright {
6-
position: absolute;
7-
bottom: 0;
8-
width: 100%;
9-
text-align: center;
10-
color: white;
11-
height: 96px;
12-
padding-left: 24px;
13-
}
14-
155
.fa-rotate-45 {
166
-webkit-transform: rotate(45deg);
177
-moz-transform: rotate(45deg);

dsmr_frontend/templates/dsmr_frontend/base.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -141,28 +141,29 @@
141141
</li>
142142
<li>
143143
<a href="{% url 'frontend:feedback-redirect' %}" target="_blank">
144-
<i class="fas fa-xs fa-comments"></i> &nbsp; <small>{% trans "Feedback" %}</small>
144+
<i class="fas fa-xs fa-comments"></i> &nbsp; <small>{% trans "Feedback / bugs / ideas" %}</small>
145+
</a>
146+
</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>
145150
</a>
146151
</li>
147152
<li>
148153
<a href="{% url 'frontend:donations-redirect' %}" target="_blank">
149-
<i class="fas fa-xs fa-heart"></i> &nbsp; <small>{% trans "Donations / tips" %}</small>
154+
<i class="fas fa-xs fa-hand-holding-usd"></i> &nbsp; <small>{% trans "Donations / tips" %}</small>
155+
</a>
156+
</li>
157+
<li>
158+
&nbsp;
159+
</li>
160+
<li>
161+
<a href="https://nl.linkedin.com/in/dennissiemensma" target="_blank">
162+
<i class="far fa-xs fa-copyright"></i> &nbsp; <small>Dennis Siemensma 2015 - {% now "Y" %}</small>
150163
</a>
151164
</li>
152165
</ul>
153166
</section>
154-
155-
<div class="row copyright">
156-
<small>
157-
&copy; <a href="https://nl.linkedin.com/in/dennissiemensma" target="_blank">Dennis Siemensma</a> 2015 - {% now "Y" %}
158-
</small>
159-
<br />
160-
<small>{% trans "Thanks to" %} <a href="https://dsmr-reader.readthedocs.io/{{ LANGUAGE_CODE }}/{{ DSMRREADER_MAIN_BRANCH }}/credits.html" target="_blank">{% trans "all the contributers" %}</a></small>
161-
<br />
162-
<br />
163-
<small><a href="https://github.com/dennissiemensma/dsmr-reader" target="_blank" title="{% trans 'View repository on Github' %}"><img src="{% static 'dsmr_frontend/img/GitHub-Mark-32px.png' %}" /> {% trans 'View on Github' %}</a></small>
164-
<small></small>
165-
</div>
166167
</aside>
167168
<aside class="right-side">
168169
<div class="clearfix"></div>
-115 Bytes
Binary file not shown.

dsmrreader/locales/nl/LC_MESSAGES/django.po

+17-14
Original file line numberDiff line numberDiff line change
@@ -976,24 +976,15 @@ msgstr "Help / FAQ"
976976
msgid "API docs"
977977
msgstr "API docs"
978978

979-
msgid "Feedback"
980-
msgstr "Feedback"
979+
msgid "Feedback / bugs / ideas"
980+
msgstr "Feedback / fouten / ideeën"
981+
982+
msgid "Thanks to all the contributers"
983+
msgstr "Dank aan alle bijdragen"
981984

982985
msgid "Donations / tips"
983986
msgstr "Donaties"
984987

985-
msgid "Thanks to"
986-
msgstr "Dankzij"
987-
988-
msgid "all the contributers"
989-
msgstr "iedereen die bijgedragen heeft"
990-
991-
msgid "View repository on Github"
992-
msgstr "Bekijk repository op Github"
993-
994-
msgid "View on Github"
995-
msgstr "Bekijk op Github"
996-
997988
msgid "Base selection"
998989
msgstr "Basisselectie"
999990

@@ -2521,6 +2512,18 @@ msgstr "Nederlands"
25212512
msgid "English"
25222513
msgstr "Engels"
25232514

2515+
#~ msgid "Feedback"
2516+
#~ msgstr "Feedback"
2517+
2518+
#~ msgid "Thanks to"
2519+
#~ msgstr "Dankzij"
2520+
2521+
#~ msgid "View repository on Github"
2522+
#~ msgstr "Bekijk repository op Github"
2523+
2524+
#~ msgid "View on Github"
2525+
#~ msgstr "Bekijk op Github"
2526+
25242527
#~ msgid "Skip to admin"
25252528
#~ msgstr "Sla over naar admin"
25262529

0 commit comments

Comments
 (0)