undersys/proxadmin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

transaction page polish, terms logo removed, addr are primary btn in admin

Browse source
This commit is contained in:
deflax 2017-08-22 04:12:07 +03:00
parent a01d7fd989
commit 28ab707fca
4 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models.py
View file

@ -288,6 +288,7 @@ class Address(db.Model):
def genmac(self):
alladdr = Address.query.all()
allmacs = []
current_app.logger.info('populating mac addr pool')
for addr in alladdr:
allmacs.append(str(addr.mac))
while True:

2
app/templates/admin/admin_tasks.html
View file

@ -4,12 +4,12 @@
<div class="panel-body">
<center>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deployments</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</button>
<button class="btn btn-danger btn-md" onclick="window.open('{{ url_for('admin.list_cancelled') }}', '_self')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Recycle Bin</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-usd" aria-hidden="true"></span> Transactions</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button>
</center>
</div>
</div>

1
app/templates/main/terms.html
View file

@ -8,7 +8,6 @@
<div class="panel-heading">Terms of Service</div>
<div class="panel-body"><p>
<center>
<img src="../../static/images/datapoint.png" class="img-responsive"></img>
</center>
<h1>Правила и Условия</h1>

40
app/templates/uinvoice/transactions.html
View file

@ -40,28 +40,25 @@ var myChart = new Chart(ctx, {
{% block page_content %}
<div class="row">
{% block sidebar %}
<div class="col-md-4">
<div class="row">
<div class="col-md-12">
<div class="row">
{% include "/settings/acc_avatar.html" %}
</div>
</div>
{% endblock %}
<div class="row">
<div class="col-md-8">
<div class="col-md-12">
<div class="panel panel-info">
<div class="panel-heading">Wallet Graph</div>
<div class="panel-body">
<canvas id="transchart" height="80"></canvas>
</div></div></div>
<div class="col-md-4">
{% include "/settings/acc_avatar.html" %}
</div>
</div>
</div>
</div>
</div>
{% endblock %}
<div class="col-md-12">
<div class="col-md-8">
<div class="panel panel-info">
<div class="panel-heading">Transactions</div>
<div class="panel-body">
@ -70,27 +67,24 @@ var myChart = new Chart(ctx, {
<table class="table table-hover table-striped table-condensed cf">
<thead>
<tr>
<th></th>
<th>Date</th>
<th>Description</th>
<th>Amount</th>
<th>Date</th>
</tr>
</thead>
<tbody>
{% for transaction in transactions %}
{% if transaction.value > 0 %}
{% if transaction.value < 0 %}
<tr class="success">
<td><span class="glyphicon glyphicon-plus"></span></td>
<td>{{ transaction.description }}</td>
<td>{{ transaction.value }} {{ transaction.currency }}</td>
<td>{{ moment(transaction.date_created).format('lll') }}</td>
<td>{{ transaction.description }}</td>
<td>{{ transaction.value|abs }} {{ transaction.currency }}</td>
{% else %}
<tr class="danger">
<td><span class="glyphicon glyphicon-minus"></span></td>
<td>{{ transaction.description }}</td>
<td>{{ transaction.value }} {{ transaction.currency }}</td>
<tr class="default">
<td>{{ moment(transaction.date_created).format('lll') }}</td>
<td>{{ transaction.description }}</td>
<td>{{ transaction.value|abs }} {{ transaction.currency }}</td>
{% endif %}
</tr>
</tbody>