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

app/models.py

@@ -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:

app/templates/admin/admin_tasks.html

@@ -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>

app/templates/main/terms.html

@@ -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>

app/templates/uinvoice/transactions.html

@@ -40,28 +40,25 @@ var myChart = new Chart(ctx, {
 {% block page_content %}
   <div class="row">
     {% block sidebar %}
-    <div class="col-md-12">
+    <div class="col-md-4">
     <div class="row">
+       <div class="col-md-12">
+        {% include "/settings/acc_avatar.html" %}
        </div>
-    </div>
-    {% endblock %}
   
-
+       <div class="col-md-12">
-<div class="row">
-
-      <div class="col-md-8">
         <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-8">
-    <div class="col-md-12">
     <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">
+              <tr class="default">
-                <td><span class="glyphicon glyphicon-minus"></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>
             {% endif %}
               </tr>
            </tbody>