Merge pull request #2723 from matiu/feat/wallet-alias

Support wallet aliases
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-14 16:11:18 -03:00
commit 06fef225bd
12 changed files with 118 additions and 17 deletions

View file

@ -21,7 +21,7 @@
<section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color': noColor ? '#7A8C9E' : index.backgroundColor}">
{{(titleSection|translate) || index.walletName}}
{{(titleSection|translate) || (index.alias || index.walletName)}}
</h1>
</section>
</nav>

View file

@ -9,7 +9,16 @@
<div class="content preferences" ng-controller="preferencesController as preferences">
<ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
<h4 class="title m0" translate>{{index.walletName}} settings</h4>
<h4 class="title m0">{{index.alias}} [{{index.walletName}}] <span translate>settings</span></h4>
<li class="line-b p20" ng-click="$root.go('preferencesAlias')">
<span translate>Wallet Alias</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i>
{{index.alias||index.walletName}}
</span>
</li>
<li class="line-b p20" ng-click="$root.go('preferencesColor')">
<span translate>Color</span>

View file

@ -0,0 +1,18 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
</div>
<div class="content preferences p20v" ng-controller="preferencesAliasController as prefAlias">
<form name="settingsAliasForm" ng-submit="prefAlias.save()" class="columns">
<label>Alias for <i>{{index.walletName}}</i></label>
<input type="text" id="alias2" type="text" name="alias2" ng-model="prefAlias.alias">
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}">
</form>
<p class="text-gray text-center columns size-14"> Changing wallet alias only afects the local wallet name.
</div>
<div class="extra-margin-bottom"></div>