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

Merge pull request #146 from cmgustavo/ref/design-38

Browse source 
Ref/design 38
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 12:10:34 -03:00 • committed by GitHub
commit 5527cccc38
50 changed files with 62 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/activity.html
View file

@ -2,11 +2,8 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-title>Recent Activity</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content class="padding" ng-controller="activityController" ng-init="init()">

1
public/views/add.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/addressbook.add.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>
<span translate>Add entry</span>

1
public/views/addressbook.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>
<span translate>Addressbook</span>

1
public/views/addressbook.view.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>
<span translate>Addressbook</span>

1
public/views/amazon.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Amazon.com Gift Cards</ion-nav-title>
</ion-nav-bar>

1
public/views/amount.html
View file

@ -1,7 +1,6 @@
<ion-view id="view-amount">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

2
public/views/buyAmazon.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Buy</ion-nav-title>
</ion-nav-bar>
@ -45,6 +44,7 @@
max="500"
ng-model="fiat"
ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"
step="0.01"
autocomplete="off" ignore-mouse-wheel required>
<a class="postfix">USD</a>
</label>

1
public/views/buyGlidera.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Buy</ion-nav-title>
</ion-nav-bar>

7
public/views/buyandsell.html
View file

@ -1,10 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title translate>Buy and sell</ion-nav-title>
</ion-nav-bar>
<ion-content>

1
public/views/confirm.html
View file

@ -1,7 +1,6 @@
<ion-view id="view-confirm" ng-controller="confirmController" ng-init="init()">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/copayers.html
View file

@ -2,7 +2,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/export.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/glidera.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Glidera</ion-nav-title>
</ion-nav-bar>

7
public/views/glideraUri.html
View file

@ -1,10 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>Glidera</ion-nav-title>
</ion-nav-bar>

1
public/views/import.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Import Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/join.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
</ion-nav-bar>

1
public/views/paperWallet.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Sweep paper wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/preferences.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesController" ng-init="init()">

1
public/views/preferencesAbout.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAbout">

1
public/views/preferencesAdvanced.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Advanced Preferences' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAdvancedController">

1
public/views/preferencesAlias.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAliasController" >

1
public/views/preferencesAltCurrency.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" >

7
public/views/preferencesBitpayCard.html
View file

@ -1,10 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="bitpayCard.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>Preferences</ion-nav-title>
</ion-nav-bar>

1
public/views/preferencesBwsUrl.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesBwsUrlController">

1
public/views/preferencesColor.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesColorController" >

1
public/views/preferencesDeleteWallet.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesDeleteWalletController" >

1
public/views/preferencesDeleteWords.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesDeleteWordsController" >

1
public/views/preferencesEmail.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesEmailController" >

1
public/views/preferencesFee.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/preferencesGlidera.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Preferences</ion-nav-title>
</ion-nav-bar>

1
public/views/preferencesHistory.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesHistory" ng-init="csvHistory()">

1
public/views/preferencesInformation.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesInformation" ng-init="init()">

1
public/views/preferencesLanguage.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLanguageController" ng-init="init()" >

1
public/views/preferencesLogs.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLogs" ng-init="init()">

1
public/views/preferencesUnit.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesUnitController" ng-init="init()" >

11
public/views/proposals.html
View file

@ -1,12 +1,11 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-title>Pending Proposals</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>
{{'Pending Proposals'|translate}}
</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content class="padding" ng-controller="proposalsController" ng-init="init()">

1
public/views/sellGlidera.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Sell</ion-nav-title>
</ion-nav-bar>

3
public/views/starting.html
View file

@ -1,3 +0,0 @@
<h1> Starting... </h1>
Splash screen me...

1
public/views/tab-create-personal.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Create Personal Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/tab-create-shared.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Create Shared Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/termsOfUse.html
View file

@ -1,7 +1,6 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

1
public/views/translators.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Translators' | translate}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="translatorsController">

1
public/views/walletDetails.html
View file

@ -2,7 +2,6 @@
<ion-nav-bar ng-style="{'background-color': walletDetailsColor}">
<ion-nav-title>{{walletDetailsName}}</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<button class="button back-button" ng-click="startSearch(); openSearchModal()">

4
src/js/controllers/buyAmazon.js
View file

@ -28,9 +28,9 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
};
this.confirm = function() {
var title = gettextCatalog.getString('Confirm Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
var ok = gettextCatalog.getString('Buy');
popupService.showConfirm(title, null, ok, null, function(res) {
popupService.showConfirm(null, message, ok, null, function(res) {
if (res) self.createTx();
});
};

8
src/js/routes.js
View file

@ -30,7 +30,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$ionicConfigProvider.navBar.positionSecondaryButtons('right');
// NAV BACK-BUTTON TEXT/ICON
$ionicConfigProvider.backButton.icon('ion-arrow-left-c').text('');
$ionicConfigProvider.backButton.icon('icon ion-ios-arrow-thin-left').text('');
$ionicConfigProvider.backButton.previousTitleText(false);
$logProvider.debugEnabled(true);
@ -106,7 +106,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
.state('starting', {
url: '/starting',
templateUrl: 'views/starting.html'
template: '<ion-view id="starting"><ion-content>{{starting}}</ion-content></ion-view>',
controller: function($scope, $log, gettextCatalog) {
$log.info('Starting...');
$scope.starting = gettextCatalog.getString('Starting...');
}
})
/*

4
src/js/services/logHeader.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.services')
.factory('logHeader', function($log, platformInfo) {
$log.info('Starting Copay v' + window.version + ' #' + window.commitHash);
.factory('logHeader', function($window, $log, platformInfo) {
$log.info($window.appConfig.nameCase + ' v' + window.version + ' #' + window.commitHash);
$log.info('Client: '+ JSON.stringify(platformInfo) );
return {};
});

20
src/js/services/popupService.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo) {
angular.module('copayApp.services').service('popupService', function($log, $ionicPopup, platformInfo, gettextCatalog) {
var isCordova = platformInfo.isCordova;
@ -10,7 +10,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
if (!cb) cb = function() {};
$ionicPopup.alert({
title: title,
template: message,
subTitle: message,
okType: 'button-clear button-positive'
}).then(cb);
};
@ -18,7 +18,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
var _ionicConfirm = function(title, message, okText, cancelText, cb) {
$ionicPopup.confirm({
title: title,
template: message,
subTitle: message,
cancelText: cancelText,
cancelType: 'button-clear button-positive',
okText: okText,
@ -53,6 +53,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
if (buttonIndex == 1) return cb(true);
else return cb(false);
}
okText = okText || gettextCatalog.getString('OK');
cancelText = cancelText || gettextCatalog.getString('Cancel');
navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
};
@ -67,8 +69,8 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple alert popup
*
* @param {String} Title
* @param {String} Message (optional)
* @param {String} Title (optional)
* @param {String} Message
* @param {Callback} Function (optional)
*/
@ -85,10 +87,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple confirm popup
*
* @param {String} Title
* @param {String} Title (optional)
* @param {String} Message
* @param {String} okText
* @param {String} cancelText
* @param {String} okText (optional)
* @param {String} cancelText (optional)
* @param {Callback} Function
* @returns {Callback} OK: true, Cancel: false
*/
@ -105,7 +107,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
/**
* Show a simple prompt popup
*
* @param {String} Title
* @param {String} Title (optional)
* @param {String} Message
* @param {Object} Object{ inputType, inputPlaceholder, defaultText } (optional)
* @param {Callback} Function

3
src/sass/ionic.scss
View file

@ -5,6 +5,9 @@ $royal: #1e3186;
$soft-blue: rgb(100,124,232);
$base-background-color: #f5f5f5;
/* Ionic Workaround */
ion-nav-bar.hide { display: block !important; }
@import "../../bower_components/ionic/scss/ionic";

24
src/sass/main.scss
View file

@ -955,6 +955,30 @@ input[type=number] {
}
}
/* Starting */
#starting {
background: rgba(30, 49, 134, 1);
background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1)));
background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%);
color: #fff;
height: 100%;
.scroll-content {
display: table !important;
width: 100% !important;
height: 100% !important;
}
.scroll {
display: table-cell;
vertical-align: middle;
text-align: center;
}
}
@import "ionic";
@import "common";
@import "forms";