diff --git a/apps/core/static/css/style.css b/apps/core/static/css/style.css index 036a894..c0dd613 100644 --- a/apps/core/static/css/style.css +++ b/apps/core/static/css/style.css @@ -11,3 +11,7 @@ input, textarea { h3 { padding-top: 30px; } +div.tab-pane h4 { + font-size: 14px; + font-weight: 600; +} diff --git a/apps/core/static/js/skeleton-tabs.js b/apps/core/static/js/skeleton-tabs.js index 04e50e1..4520093 100644 --- a/apps/core/static/js/skeleton-tabs.js +++ b/apps/core/static/js/skeleton-tabs.js @@ -5,10 +5,16 @@ tabButtons.map(function(button) { button.addEventListener('click', function() { - active = document.querySelector('li a.active.button') + + // only get the active buttons from the current tabs control + tabnav = button.closest('ul.tab-nav'); + active = document.querySelector('#' + tabnav.id + ' li a.active.button') if (active) active.classList.remove('active'); button.classList.add('active'); - active = document.querySelector('.tab-pane.active') + + // only get the active panes from the current tabs control + tabcontent = tabnav.nextSibling.nextSibling + active = document.querySelector('#' + tabcontent.id + ' .tab-pane.active') if (active) active.classList.remove('active'); document.querySelector(button.getAttribute('href')).classList.add('active'); }) diff --git a/apps/monitor/templates/monitor.html b/apps/monitor/templates/monitor.html index 67bc91c..634cb4f 100644 --- a/apps/monitor/templates/monitor.html +++ b/apps/monitor/templates/monitor.html @@ -5,6 +5,11 @@

Monitor

Refresh

Hint: these numbers are not very accurate.

+ + Total investment: {{total_investment|floatformat:2}} EUR
+ Virtual value of wallet: {{current_value|floatformat:2}} EUR
+ Total tax free: {{total_tax_free|floatformat:2}} EUR
+
{% for c in cryptos %} @@ -15,41 +20,16 @@
- {% if c.bought %} - We have bought {{ c.crypto }} for {{ c.bought|floatformat:2 }} EUR
- {% endif %} - {% if c.sold %} - We have sold {{ c.crypto }} for {{ c.sold|floatformat:2 }} EUR
- {% endif %} - {% if c.amount_kept %} - Current value of our {{ c.amount_kept|floatformat:3 }} {{ c.crypto }} is {{ c.current_value|floatformat:2 }} EUR
- {% endif %} - {% if c.bought_recently %} - We have bought within the last 12 months: {{ c.bought_recently|floatformat:3 }} {{ c.crypto }}
- {% endif %} - {% if c.bought_tax_free %} - We can sell without paying taxes: {{ c.bought_tax_free|floatformat:3 }} {{ c.crypto }} for {{ c.value_tax_free|floatformat:2 }} EUR
- {% endif %} -
My transactions
- {% if c.rates %} - - {% for r in c.rates %} - - - - - - - {% endfor %} -
{{ r.dateRelative }}{{ r.date|date:'Y-m-d' }}{{ r.rateEUR|floatformat:0 }} EUR/{{ c.crypto }}{% if r.diffPercentage %} - {{ r.diffPercentage|floatformat:1 }}% - {% endif %} -
- -