Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 23:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Timer JS fixes (#1054)

Browse Source 
Add months to duration output
Update momentjs
Move EVE time generation function to shared source

Fixes timerboard showing EVE time as local time.
Changed to show 24 hour time.
This commit is contained in:
Basraah 2018-05-10 10:31:02 +10:00 committed by Adarnof
parent 86f57ccd56
commit 6187fb9b86
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
allianceauth/optimer/templates/optimer/management.html
View File

@ -19,7 +19,8 @@
<div class="col-lg-12 text-center row"> <div class="col-lg-12 text-center row">
<div class="label label-info text-left"> <div class="label label-info text-left">
<b>{% trans "Current Eve Time:" %} </b> <b>{% trans "Current Eve Time:" %} </b>
</div><div class="label label-info text-left" id="current-time"></div> </div>
<strong class="label label-info text-left" id="current-time"></strong>
<br /> <br />
</div> </div>
@ -111,7 +112,7 @@
} }
function updateClock() { function updateClock() {
document.getElementById("current-time").innerHTML = "<b>" + moment.utc().format('LLLL') + "</b>"; document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
} }
</script> </script>
{% endblock content %} {% endblock content %}

8
allianceauth/static/js/timers.js
View File

@ -8,8 +8,16 @@ function getDurationString(duration) {
if (duration.years()) { if (duration.years()) {
out += duration.years() + 'y '; out += duration.years() + 'y ';
} }
if (duration.months()) {
out += duration.months() + 'm ';
}
if (duration.days()) { if (duration.days()) {
out += duration.days() + 'd '; out += duration.days() + 'd ';
} }
return out + duration.hours() + "h " + duration.minutes() + "m " + duration.seconds() + "s"; return out + duration.hours() + "h " + duration.minutes() + "m " + duration.seconds() + "s";
} }
function getCurrentEveTimeString() {
return moment().utc().format('dddd LL HH:mm:ss')
}

4
allianceauth/templates/bundles/moment-js.html
View File

@ -1,4 +1,4 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.min.js"></script>
{% if locale and LANGUAGE_CODE != 'en' %} {% if locale and LANGUAGE_CODE != 'en' %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/locale/{{ LANGUAGE_CODE }}.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/locale/{{ LANGUAGE_CODE }}.js"></script>
{% endif %} {% endif %}

5
allianceauth/timerboard/templates/timerboard/view.html
View File

@ -18,7 +18,8 @@
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<div class="label label-info text-left"> <div class="label label-info text-left">
<b>{% trans "Current Eve Time:" %} </b> <b>{% trans "Current Eve Time:" %} </b>
</div><div class="label label-info text-left" id="current-time"></div> </div>
<strong class="label label-info text-left" id="current-time"></strong>
</div> </div>
{% if corp_timers %} {% if corp_timers %}
<h4><b>{% trans "Corp Timers" %}</b></h4> <h4><b>{% trans "Corp Timers" %}</b></h4>
@ -555,7 +556,7 @@
} }
function updateClock() { function updateClock() {
document.getElementById("current-time").innerHTML = "<b>" + moment().format('LLLL') + "</b>"; document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
} }
</script> </script>
{% endblock content %} {% endblock content %}