anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3419 from cmgustavo/ref/global-preferences-sidebar

Browse source 
Moves the global preferences to the sidebar
This commit is contained in:
Matias Alejo Garcia 2015-11-16 11:00:52 -03:00
commit 95217cef02
21 changed files with 201 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/includes/sidebar.html
View file

@ -36,5 +36,15 @@
<div>Glidera</div>
</a>
</li>
<li>
<a ng-click="$root.go('preferencesGlobal')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t"></i>
<i class="fi-widget size-24 icon"></i>
<div class="tu text-bold">
<span class="size-12">Settings</span>
</div>
<div>Global preferences</div>
</a>
</li>
</ul>
</nav>

62
public/views/preferences.html
View file

@ -2,7 +2,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Preferences'; closeToHome = true">
ng-init="titleSection='Wallet Preferences'; closeToHome = true">
</div>
@ -17,7 +17,7 @@
{{index.alias||index.walletName}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Wallet Alias</div>
<div translate>Alias</div>
</li>
<li ng-click="$root.go('preferencesEmail')">
@ -50,7 +50,7 @@
<li ng-click="$root.go('backup')" ng-hide="index.isPrivKeyExternal">
<div class="right text-gray">
<span class="text-warning" ng-show="index.needsBackup">
<i class="fi-alert"></i><span translate>Still not done</span>
<i class="fi-alert"></i> <span translate>Still not done</span>
</span>
<i class="icon-arrow-right3 size-24 text-gray"></i>
</div>
@ -77,62 +77,6 @@
</li>
</ul>
</div>
<ul class="no-bullet m0 ">
<h4 translate>Global settings</h4>
<li ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesLanguage')">
<div class="right text-gray">
{{preferences.currentLanguageName|translate}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Language</div>
</li>
<li ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesUnit')">
<div class="right text-gray">
{{preferences.unitName}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Unit</div>
</li>
<li ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesAltCurrency')">
<div class="right text-gray">
{{preferences.selectedAlternative.name}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Alternative Currency</div>
</li>
<li ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesFee')"
ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
<div class="right text-gray">
{{index.feeOpts[index.currentFeeLevel]|translate}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Bitcoin Network Fee Policy</div>
</li>
<li ng-show="!index.noFocusedWallet">
<switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
<div translate>Use Unconfirmed Funds</div>
</li>
<li ng-show="!index.noFocusedWallet">
<switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
<div>Enable Glidera Service</div>
</li>
<!-- Disabled for testnet
<li ng-show="!index.noFocusedWallet && glideraEnabled">
<span>Glidera Sandbox</span>
<switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
</li>
-->
<li ng-click="$root.go('about')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>About Copay</div>
</li>
</ul>
<h4></h4>
</div>

2
public/views/preferencesAbout.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='About Copay'; goBackToState = 'preferences'">
ng-init="titleSection='About Copay'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>
<div class="content preferences" ng-controller="preferencesAbout as about">

2
public/views/preferencesAltCurrency.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Alternative Currency'; goBackToState = 'preferences'; noColor = true">
ng-init="titleSection='Alternative Currency'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>

2
public/views/preferencesFee.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferences'; noColor = true">
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>
<div class="content preferences" ng-controller="preferencesFeeController as prefFee">
<h4></h4>

78
public/views/preferencesGlobal.html Normal file
View file

@ -0,0 +1,78 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Global Preferences'; closeToHome = true; noColor = true">
</div>
<div class="content preferences" ng-controller="preferencesGlobalController as prefGlobal" ng-init="prefGlobal.init()">
<ul class="no-bullet m0 ">
<h4></h4>
<li ng-click="$root.go('preferencesLanguage')">
<div class="right text-gray">
{{prefGlobal.currentLanguageName|translate}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Language</div>
</li>
</ul>
<ul class="no-bullet m0 ">
<h4></h4>
<li ng-click="$root.go('preferencesUnit')">
<div class="right text-gray">
{{prefGlobal.unitName}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Unit</div>
</li>
<li ng-click="$root.go('preferencesAltCurrency')">
<div class="right text-gray">
{{prefGlobal.selectedAlternative.name}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Alternative Currency</div>
</li>
</ul>
<ul class="no-bullet m0 ">
<h4></h4>
<li ng-click="$root.go('preferencesFee')"
ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
<div class="right text-gray">
{{index.feeOpts[index.currentFeeLevel]|translate}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Bitcoin Network Fee Policy</div>
</li>
<li>
<switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
<div translate>Use Unconfirmed Funds</div>
</li>
</ul>
<ul class="no-bullet m0 ">
<h4></h4>
<li>
<switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
<div>Enable Glidera Service</div>
</li>
<!-- Disabled for testnet
<li ng-show="glideraEnabled">
<span>Glidera Sandbox</span>
<switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
</li>
-->
</ul>
<ul class="no-bullet m0">
<h4></h4>
<li ng-click="$root.go('about')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>About Copay</div>
</li>
</ul>
<h4></h4>
</div>
<div class="extra-margin-bottom"></div>

2
public/views/preferencesLanguage.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Language'; goBackToState = 'preferences'; noColor = true">
ng-init="titleSection='Language'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>

2
public/views/preferencesLogs.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Session log'; goBackToState = 'about'">
ng-init="titleSection='Session log'; goBackToState = 'about'; noColor = true">
</div>

2
public/views/preferencesUnit.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Unit'; goBackToState = 'preferences'; noColor = true">
ng-init="titleSection='Unit'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>

2
public/views/translators.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Translators'; goBackToState = 'about'">
ng-init="titleSection='Translators'; goBackToState = 'about'; noColor = true">
</div>
<div class="content preferences">

4
public/views/walletHome.html
View file

@ -11,8 +11,8 @@
</div>
<button class="button black round expand" ng-click="$root.go('add')" translate>Create</button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
<button class=" outline round dark-gray tiny" translate> Preferences </button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferencesGlobal')">
<button class=" outline round dark-gray tiny" translate>Settings</button>
</div>
</div>