Skip to content

Commit

Permalink
Minor GUI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
EggPool committed Oct 5, 2019
1 parent 1e66ccd commit b4e58d5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 66 deletions.
24 changes: 16 additions & 8 deletions todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Failsafes

- FEES: JS as well as BismuthClient: add specia lops, like alias and token!!!
- FEES: JS as well as BismuthClient: add special ops, like alias and token!!!



Expand All @@ -16,7 +16,7 @@ OK - only listen to 127.0.0.1 app.listen() + options

- https + user login => can use over the net

- allow to force/change the locale. top bar, use emojis?
OK - allow to force/change the locale. top bar, use emojis?

- avoid create wallet with no name

Expand All @@ -26,28 +26,36 @@ OK - est. fees

OK - crystals menu

- wallet server selection (link there but no route)
OK - wallet server selection (link there but no route)

- "queued on the blockchain" rather than "inserted to mempool" (mempool / pool/ eggpool ??)


- modal to confirm.
OK - modal to confirm.
- js code , data table generic
- check balance
OK - check balance

OK - D: prefix for custom dragginator terms to translate.


- wallet version + update (auto update? => os + version)
- crystals version (api?) + update
- crystal on/off
OK - crystals version (api?) + update
OK - crystal on/off

- auto lock wallet after time out. (lock after time or 1 tx)
- pin to send tx
OK - pin to send tx
- warning if wallet not encrypted

- 2fa (token) to auto unlock wallet?


- api: balance server (all addresses, bis as well as tokens)
(+ reindex)

- failsafe /load/global and /load/detail

# Features req.

- define usual addresses with local labels
- store bisurl for easy sending
- attach colored label (like category with color) to our addresses, help differentiate our own adds from service ones.
8 changes: 4 additions & 4 deletions wallet/crystals/020_bismuthvote/themes/default/motion.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ <h4 class="card-title">{{ _('BISMUTH VOTING') }} : BGV-{{ motion["Motion_number"
<ul>
<li>id: {{ motion["Motion_number"] }}</li>
<li>Txid: {{ motion["Motion_id"] }}</li>
<li>Url: <a href="{{ motion["Motion_url"] }}">{{ motion["Motion_url"] }} <i class="material-icons">open_in_new</i></a></li>
<li>Url: <a href="{{ motion['Motion_url'] }}">{{ motion["Motion_url"] }} <i class="material-icons">open_in_new</i></a></li>
<li>Address: {{ motion["Motion_address"] }}</li>
<li>Start date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_start_date"]).strftime('%Y-%m-%d %H:%M:%S') }}</li>
<li>Reveal date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_reading_date"]).strftime('%Y-%m-%d %H:%M:%S') }}</li>
<li>End date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_end_date"]).strftime('%Y-%m-%d %H:%M:%S') }}</li>
<li>Start date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_start_date"]).strftime('%Y-%m-%d %H:%M:%S') }} UTC</li>
<li>Reveal date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_reading_date"]).strftime('%Y-%m-%d %H:%M:%S') }} UTC</li>
<li>End date: {{ datetime.datetime.utcfromtimestamp(motion["Vote_end_date"]).strftime('%Y-%m-%d %H:%M:%S') }} UTC</li>
<li>Status: <i class="material-icons" >{{ motion["Material_status"] }}</i> {{ motion['Status'] }}</li>
</ul>

Expand Down
54 changes: 0 additions & 54 deletions wallet/themes/material/wallet_load_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,67 +89,13 @@ <h4 class="card-title">{{ _("Your Bismuth addresses") }}</h4>
</table>
</div>

<form method="post" action="/wallet/new_address">
<div class="card-body">
<div class="row">

<div class="col-lg-3 col-md-3 col-xs12">
<div class="form-group">
<label class="bmd-label-floating">{{ _("Label")}}</label>
<input class="form-control" type="text" name="label"/>
<small>{{ _("A private label for the new address")}}</small>
</div>
</div>
<div class="col-lg-3 col-md-3 col-xs12">
{% raw xsrf_form_html() %}
<button type="submit" class="btn btn-warning"><i class="material-icons">create_new_folder</i>&nbsp;{{ _("Create a new address")}}</button>
<i class="material-icons" title="{{ _('This is likely to take some time, please do not interrupt the process.')}}">hourglass_empty</i>
</div>

</div>
</div>
</form>

</div>
</div>


</div>


<div class="card-body table-responsive">
{{ _("Potential legacy wallet imports")}}
<table class="table table-hover">
<thead class="text-warning">
<th>{{ _("File")}}</th>
<th>{{ _("Address")}}</th>
<th>{{ _("Encrypted")}}</th>
<th>{{ _("Action")}}</th>
</thead>
<tbody>
{% for wallet in wallets %}
<!-- TODO: do not allow to import more than once -->
<tr style="border-bottom:1px solid #808080;">
<td>{{ wallet['file'] }}</td>
{% if wallet['encrypted'] == False %}
<td><a href="/wallet/import_der/{{ wallet['file'] }}">{{ wallet['address'] }}</a></td>
<td>{{ wallet['encrypted'] }}</td>
<td><a href="/wallet/import_der/{{ wallet['file'] }}">
<i class="material-icons" title="{{ _('Import')}}">get_app</i>
</a></td>
{% else %}
<td><a href="/wallet/import_encrypted_der1/{{ wallet['file'] }}">{{ wallet['address'] }}</a></td>
<td>{{ wallet['encrypted'] }}</td>
<td><a href="/wallet/import_encrypted_der1/{{ wallet['file'] }}">
<i class="material-icons" title="{{ _('Import')}}">get_app</i>
</a></td>
{% end %}
</tr>
{% end %}
</tbody>
</table>
</div>


<div id="edit_window" class="modal" tabindex="-1" role="dialog">

Expand Down

0 comments on commit b4e58d5

Please sign in to comment.