Merge pull request #1374 from chainsol/devel

Fix Player -> Account in Website Templates
This commit is contained in:
Griatch 2017-08-08 19:18:04 +02:00 committed by GitHub
commit 9102a168c8
2 changed files with 10 additions and 10 deletions

View file

@ -9,14 +9,14 @@
<div class="card-block">
<h1 class="card-title">Admin</h1>
<p class="card-text">
Welcome to the Evennia Admin Page. Here, you can edit many facets of players, characters, and other parts of the game.
Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.
</p>
<hr />
<p class="card-text">
<h2><a href="{% url "admin:players_playerdb_changelist" %}">Players</a></h2>
Players are user accounts. Players can have several characters under them. A user's login and password information can be changed here.
<h2><a href="{% url "admin:accounts_accountdb_changelist" %}">Accounts</a></h2>
Accounts can have several characters under them. A user's login and password information can be changed here.
</p>
<p class="card-text">

View file

@ -52,14 +52,14 @@
<div class="row">
<div class="col-12 col-md-4 mb-3">
<div class="card">
<h4 class="card-header">Players</h4>
<h4 class="card-header">Accounts</h4>
<div class="card-block">
<p>
There's currently <strong>{{num_players_connected}}</strong> connected out of a total of <strong>{{num_players_registered}}</strong> players registered.
There's currently <strong>{{num_accounts_connected}}</strong> connected out of a total of <strong>{{num_accounts_registered}}</strong> account{{num_accounts_registered|pluralize}} registered.
</p>
<p>
Of these, <strong>{{num_players_registered_recent}}</strong> were created this week, and <strong>{{num_players_connected_recent}}</strong> have connected within the last seven days.
Of these, <strong>{{num_accounts_registered_recent}}</strong> were created this week, and <strong>{{num_accounts_connected_recent}}</strong> have connected within the last seven days.
</p>
</div>
</div>
@ -71,8 +71,8 @@
<div class="card-block px-0 py-0">
<ul class="list-group">
{% for player in players_connected_recent %}
<li class="list-group-item">{{player.username}} -- <em>{{player.last_login|timesince}} ago</em></li>
{% for account in accounts_connected_recent %}
<li class="list-group-item">{{account.username}}&mdash;<em>{{account.last_login|timesince}} ago</em></li>
{% endfor %}
</ul>
</div>
@ -85,8 +85,8 @@
<div class="card-block py-0 px-0">
<ul class="list-group">
<li class="list-group-item">{{num_players_registered}} players (+ {{num_characters}} characters)</li>
<li class="list-group-item">{{num_rooms}} rooms (+ {{num_exits}} exits)</li>
<li class="list-group-item">{{num_accounts_registered}} account{{num_accounts_registered|pluralize}} (+ {{num_characters}} character{{num_characters|pluralize}})</li>
<li class="list-group-item">{{num_rooms}} room{{num_rooms|pluralize}} (+ {{num_exits}} exits)</li>
<li class="list-group-item">{{num_others}} other objects</li>
</ul>
</div>