add more buttons

This commit is contained in:
bechi 2015-05-18 11:51:36 -03:00
parent 0835c236f5
commit 1f7e9b2227
8 changed files with 35 additions and 32 deletions

View File

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Backup'; goBackToState = 'preferences'">
</div>
@ -17,36 +17,36 @@
<label for="password" translate>Set up a Password for your backup</label>
<div class="input">
<input type="password" class="form-control"
<input type="password" class="form-control"
placeholder="{{'Your backup password'|translate}}"
name="password" ng-model="backup.password">
</div>
<label for="password" translate>Repeat password</label>
<div class="input">
<input type="password" class="form-control"
<input type="password" class="form-control"
placeholder="{{'Repeat password'|translate}}"
name="password" ng-model="backup.repeatpassword">
</div>
<button class="black radius expand" ng-click="backup.downloadWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
<button class="black round expand" ng-click="backup.downloadWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
<span translate>Download backup</span></button>
<button class="black radius expand" ng-click="backup.viewWalletBackup()"
<button class="black round expand" ng-click="backup.viewWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-style="{'background-color':index.backgroundColor}"
ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
<span translate>View backup</span></button>
<div ng-show="backup.isCordova">
<h4 translate>Backup options</h4>
<button class="black radius expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
<span translate>Copy to clipboard</span></button>
<button class="black radius expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
<span translate>Send by email</span></button>
</div>
@ -59,7 +59,7 @@
<textarea rows="12">{{backup.backupWalletPlainText}}</textarea>
</div>
<div class="size-12 text-gray text-right">
<i class="icon-compose"></i>
<i class="icon-compose"></i>
<span translate>Copy this text as it is to a safe place (notepad or email)</span>
</div>
</div>

View File

@ -2,7 +2,7 @@
<div class="passModalMask">
</div>
<div ng-controller="passwordController as pass" class="passModal"
<div ng-controller="passwordController as pass" class="passModal"
ng-class="{'animated bounceInDown':index.askPassword}"
>
<div class="columns m20t">
@ -21,13 +21,13 @@
</div>
<div class="row">
<div class="small-6 columns">
<button class="radius small-6 columns outline dark-gray expand" ng-click="pass.close(index.askPassword.callback)" translate>
<button class="round small-6 columns outline dark-gray expand" ng-click="pass.close(index.askPassword.callback)" translate>
CANCEL
</button>
</div>
<div class="small-6 columns">
<button class="radius expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"
<button class="round expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"
ng-style="{'background-color':index.backgroundColor}">
<span translate ng-if="index.askPassword.isSetup" translate>SET</span>
<span translate ng-if="!index.askPassword.isSetup" translate>ENTER</span>

View File

@ -5,7 +5,7 @@
<span translate>Payment Sent</span>
</div>
<div class="text-center">
<a class="button outline white small-5" ng-click="cancel()" translate>OKAY</a>
<a class="button outline round white tiny small-4" ng-click="cancel()" translate>OKAY</a>
</div>
</div>
@ -15,7 +15,7 @@
{{statusStr|translate}}
</div>
<div class="text-center">
<a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
<a class="button outline round light-gray tiny small-4" ng-click="cancel()" translate>OKAY</a>
</div>
</div>
@ -25,6 +25,6 @@
{{statusStr|translate}}
</div>
<div class="text-center">
<a class="button outline light-gray small-5" ng-click="cancel()" translate>OKAY</a>
<a class="button outline light-gray round tiny small-4" ng-click="cancel()" translate>OKAY</a>
</div>
</div>

View File

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
</div>
@ -10,7 +10,7 @@
<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}}"
<input type="submit" class="button expand black round" 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.

View File

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcore Wallet Service'; goBackToState = 'preferences'; noColor = true">
</div>
@ -10,7 +10,7 @@
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
<label>Bitcore Wallet Service URL</label>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
<input type="submit" class="button expand black round" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}">
</form>
</div>

View File

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Delete Wallet'; goBackToState = 'preferencesAdvanced'">
</div>
@ -14,7 +14,7 @@
</div>
<div class="columns text-center m10t">
<p translate class="size-14 text-gray">Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED</p>
<button class="button expand warning" ng-click="preferences.deleteWallet()" translate>
<button class="button round expand warning" ng-click="preferences.deleteWallet()" translate>
Delete wallet
</button>
</div>

View File

@ -696,7 +696,6 @@ button.black,
.button.black {
background-color: #2C3E50;
color: #fff;
border: 1px solid transparent;
}
/* GRAY */
@ -706,6 +705,10 @@ button.gray,
color: #2C3E50;
}
button.disabled, button[disabled], .button.disabled, .button[disabled] {
border-color: transparent;
}
button.disabled.black,
button[disabled].black,
.button.disabled.black,

View File

@ -52,7 +52,7 @@ angular.module('copayApp.services')
var config = configService.getSync();
config.colorFor = config.colorFor || {};
var color = config.colorFor[walletId] || '#2C3E50';
var color = config.colorFor[walletId] || '#7A8C9E';
var name = config.aliasFor[walletId] || walletName;
switch (notificationData.type) {