Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-10 00:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/R4stl1n/allianceauth into R4stl1n-master

Browse Source
This commit is contained in:
johanko
2016-04-21 06:32:18 +00:00
parent 819be1df4d ed53906726
commit 2dd531c2b7
23 changed files with 1591 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
stock/templates/registered/operationmanagement.html
View File

@@ -40,7 +40,7 @@
<th class="text-center">Action</th>
{% endif %}
</tr>
{% for ops in optimer %}
<tr>
<td style="width:150px" class="text-center">{{ ops.operation_name }}</td>
@@ -54,7 +54,7 @@
<td style="width:150px" class="text-center">{{ ops.duration }}</td>
<td style="width:150px" class="text-center">{{ ops.fc }}</td>
<td style="width:150px" class="text-center">{{ ops.details }}</td>
<td style="width:150px" class="text-center">{{ ops.post_time}}</td>
<td style="width:150px" class="text-center">{{ ops.post_time}}</td>
{% if perms.auth.optimer_management %}
<td style="width:150px" class="text-center">{{ ops.eve_character }}</td>
<td class="text-center">
@@ -67,27 +67,24 @@
class="glyphicon glyphicon-pencil"></span></button>
</a>
</td>
{% endif %}
</tr>
{% endfor %}
</tr>
</table>
</div>
<script src="/static/js/dateformat.js"></script>
<script src="/static/js/countdown.js"></script>
<script>
var clockClosest = document.getElementById("countdownclosest"), targetDate = new Date(Date.UTC({{ ops.start | date:"Y, m-1, d, H, i" }}));{% for ops in optimer %}
var clock{{ ops.id }} = document.getElementById("countdown{{ ops.id }}"), targetDate{{ ops.id }} = new Date(Date.UTC({{ ops.start | date:"Y, m-1, d, H, i" }}));{% endfor %}
setInterval(function(){clockClosest.innerHTML = targetDate.format('D @ h:ia'); if (targetDate > Date.now()){ clockClosest.innerHTML = clockClosest.innerHTML + "<BR>" + countdown(targetDate).toString();}}, 1000);
{% for ops in optimer %}var clock{{ ops.id }} = document.getElementById("countdown{{ ops.id }}"), targetDate{{ ops.id }} = new Date(Date.UTC({{ ops.start | date:"Y, m-1, d, H, i" }}));{% endfor %}
{% for ops in optimer %}setInterval(function(){clock{{ ops.id }}.innerHTML = targetDate{{ ops.id }}.format('D @ h:ia'); if (targetDate{{ ops.id }} > Date.now()){ clock{{ ops.id }}.innerHTML = clock{{ ops.id }}.innerHTML + "<BR>" + countdown(targetDate{{ ops.id }}).toString();}}, 1000);{% endfor %}
setInterval(function(){updateClock()}, 1000);
function updateClock() {
@@ -97,5 +94,4 @@ function updateClock() {
</script>
{% endblock content %}

220
stock/templates/registered/services.html
View File

@@ -19,6 +19,7 @@
<th class="text-center">Action</th>
</tr>
{% if ENABLE_BLUE_FORUM %}
<tr>
<td class="text-center">Forums</td>
<td class="text-center">{{ authinfo.forum_username }}</td>
<td class="text-center">{{ authinfo.forum_password }}</td>
@@ -44,8 +45,39 @@
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_SMF %}
<tr>
<td class="text-center">SMF Forums</td>
<td class="text-center">{{ authinfo.smf_username }}</td>
<td class="text-center">{{ authinfo.smf_password }}</td>
<td class="text-center"><a href="{{ SMF_URL }}">{{ SMF_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.smf_username "" %}
<a href="{% url 'auth_activate_smf' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_smf_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_smf_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_smf' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_IPBOARD %}
<tr>
<td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td>
@@ -71,6 +103,65 @@
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_MARKET %}
<tr>
<td class="text-center">Alliance Market</td>
<td class="text-center">{{ authinfo.market_username }}</td>
<td class="text-center">{{ authinfo.market_password }}</td>
<td class="text-center"><a href="{{ MARKET_URL }}">{{ MARKET_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.market_username "" %}
<a href="{% url 'auth_activate_market' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_market_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_market_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_market' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_PATHFINDER %}
<tr>
<td class="text-center">Pathfinder</td>
<td class="text-center">{{ authinfo.pathfinder_username }}</td>
<td class="text-center">{{ authinfo.pathfinder_password }}</td>
<td class="text-center"><a href="{{ PATHFINDER_URL }}">{{ PATHFINDER_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.pathfinder_username "" %}
<a href="{% url 'auth_activate_pathfinder' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_pathfinder_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_pathfinder_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_pathfinder' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_JABBER %}
<tr>
@@ -182,6 +273,27 @@
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_DISCOURSE %}
<tr>
<td class="text-center">Discourse</td>
<td class="text-center">{{ authinfo.discourse_username }}</td>
<td class="text-center">{{ authinfo.discourse_password }}</td>
<td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.discourse_username "" %}
<a href="{% url 'auth_activate_discourse' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_deactivate_discourse' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_TEAMSPEAK3 %}
<tr>
<th class="text-center">Service</th>
@@ -260,7 +372,37 @@
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_SMF %}
<tr>
<td class="text-center">SMF Forums</td>
<td class="text-center">{{ authinfo.smf_username }}</td>
<td class="text-center">{{ authinfo.smf_password }}</td>
<td class="text-center"><a href="{{ SMF_URL }}">{{ SMF_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.smf_username "" %}
<a href="{% url 'auth_activate_smf' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_smf_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_smf_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_smf' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_IPBOARD %}
<tr>
<td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td>
@@ -286,6 +428,65 @@
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_MARKET %}
<tr>
<td class="text-center">Alliance Market</td>
<td class="text-center">{{ authinfo.market_username }}</td>
<td class="text-center">{{ authinfo.market_password }}</td>
<td class="text-center"><a href="{{ MARKET_URL }}">{{ MARKET_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.market_username "" %}
<a href="{% url 'auth_activate_market' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_market_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_market_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_market' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_PATHFINDER %}
<tr>
<td class="text-center">Pathfinder</td>
<td class="text-center">{{ authinfo.pathfinder_username }}</td>
<td class="text-center">{{ authinfo.pathfinder_password }}</td>
<td class="text-center"><a href="{{ PATHFINDER_URL }}">{{ PATHFINDER_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.pathfinder_username "" %}
<a href="{% url 'auth_activate_pathfinder' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_pathfinder_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_pathfinder_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_pathfinder' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_JABBER %}
<tr>
@@ -397,6 +598,25 @@
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_DISCOURSE %}
<td class="text-center">Discourse</td>
<td class="text-center">{{ authinfo.discourse_username }}</td>
<td class="text-center">{{ authinfo.discourse_password }}</td>
<td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.discourse_username "" %}
<a href="{% url 'auth_activate_discourse' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_deactivate_discourse' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
{% endif %}
{% if ENABLE_AUTH_TEAMSPEAK3 %}
<tr>
<th class="text-center">Service</th>