mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #966 from yemel/feature/android-new-design
Feature/android new design
This commit is contained in:
commit
2cbfbc071a
11
index.html
11
index.html
|
@ -3,7 +3,7 @@
|
|||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
<title>Copay - Multisignature Wallet</title>
|
||||
<link rel="stylesheet" href="css/foundation.min.css">
|
||||
<link rel="stylesheet" href="css/foundation-icons.css">
|
||||
|
@ -106,6 +106,15 @@
|
|||
<script src="js/controllers/settings.js"></script>
|
||||
<script src="js/controllers/uriPayment.js"></script>
|
||||
|
||||
<!-- PLACEHOLDER: CORDOVA SRIPT -->
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
document.addEventListener("deviceready", onDeviceReady, false);
|
||||
|
||||
function onDeviceReady() {
|
||||
setTimeout(function(){ navigator.splashscreen.hide(); }, 2000);
|
||||
}
|
||||
</script>
|
||||
|
||||
<script src="js/init.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -74,8 +74,6 @@ angular.module('copayApp.controllers').controller('SettingsController',
|
|||
unitToSatoshi: $scope.selectedUnit.value,
|
||||
}));
|
||||
|
||||
var target = ($window.location.origin !== 'null' ? $window.location.origin : '');
|
||||
|
||||
$window.location.href = target;
|
||||
$location.path('/copayers');
|
||||
};
|
||||
});
|
||||
|
|
|
@ -67,7 +67,7 @@ angular
|
|||
.module('copayApp')
|
||||
.config(function($locationProvider) {
|
||||
$locationProvider
|
||||
.html5Mode(true)
|
||||
.html5Mode(false)
|
||||
.hashPrefix('!');
|
||||
})
|
||||
.run(function($rootScope, $location) {
|
||||
|
|
|
@ -4,8 +4,11 @@ var UriHandler = function() {};
|
|||
|
||||
UriHandler.prototype.register = function() {
|
||||
var base = window.location.origin + '/';
|
||||
var url = base + '#/uri-payment/%s';
|
||||
var url = base + '#!/uri-payment/%s';
|
||||
|
||||
if(navigator.registerProtocolHandler) {
|
||||
navigator.registerProtocolHandler('bitcoin', url, 'Copay');
|
||||
}
|
||||
};
|
||||
|
||||
angular.module('copayApp.services').value('uriHandler', new UriHandler());
|
||||
|
|
|
@ -54,7 +54,7 @@ checkOK
|
|||
# Copy all app files
|
||||
echo "${OpenColor}${Green}* Copying all app files...${CloseColor}"
|
||||
cd $BUILDDIR/..
|
||||
cp -af {css,font,img,js,lib,sound,config.js,version.js,$BUILDDIR/cordova.js,$BUILDDIR/cordova_plugins.js,$BUILDDIR/plugins} $APPDIR
|
||||
cp -af {css,font,img,js,lib,sound,views,config.js,version.js,$BUILDDIR/cordova.js,$BUILDDIR/cordova_plugins.js,$BUILDDIR/plugins} $APPDIR
|
||||
checkOK
|
||||
sed "s/<\!-- PLACEHOLDER: CORDOVA SRIPT -->/<script type='text\/javascript' charset='utf-8' src='cordova.js'><\/script>/g" index.html > $APPDIR/index.html
|
||||
checkOK
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
|
||||
<div class="row" ng-if='$root.wallet && !$root.wallet.isReady() && !loading'>
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup oh">
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="text-center logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<h1 class="text-center text-white">404</h1>
|
||||
<h3 class="text-center">Page not found</h3>
|
||||
<p class="text-center"><a href="/">go back...</a></p>
|
||||
<p class="text-center"><a href="#!/">go back...</a></p>
|
||||
|
||||
|
|
|
@ -1,25 +1,25 @@
|
|||
<div class="home" ng-controller="HomeController">
|
||||
<div class="row">
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="button-setup" ng-show="hasWallets">
|
||||
<a class="text-white" href="/open">Open a wallet</a>
|
||||
<a class="text-white" href="#!/open">Open a wallet</a>
|
||||
</div>
|
||||
<div class="button-setup" ng-show="!hasWallets">
|
||||
<a class="text-secondary" href="/setup">Create a new wallet</a>
|
||||
<a class="text-secondary" href="#!/setup">Create a new wallet</a>
|
||||
</div>
|
||||
<div class="button-setup">
|
||||
<a class="text-primary" href="/join">Join a Wallet in Creation</a>
|
||||
<a class="text-primary" href="#!/join">Join a Wallet in Creation</a>
|
||||
</div>
|
||||
<div class="button-setup" ng-show="hasWallets">
|
||||
<a class="text-secondary" href="/setup">Create a wallet</a>
|
||||
<a class="text-secondary" href="#!/setup">Create a wallet</a>
|
||||
</div>
|
||||
|
||||
<div class="footer-setup">
|
||||
<a class="right size-12 text-gray" href="/settings"><i class="m10r size-14 fi-wrench"></i>Settings</a>
|
||||
<a class="left size-12 text-gray" href="/import"><i class="m10r size-14 fi-upload"></i>Import a backup</a>
|
||||
<a class="right size-12 text-gray" href="#!/settings"><i class="m10r size-14 fi-wrench"></i>Settings</a>
|
||||
<a class="left size-12 text-gray" href="#!/import"><i class="m10r size-14 fi-upload"></i>Import a backup</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
<div class="row" ng-init="choosefile=0; pastetext=0" ng-show="!loading">
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup">
|
||||
|
@ -20,7 +20,7 @@
|
|||
<input type="password" class="form-control" placeholder="Your wallet password" name="password" ng-model="password" required>
|
||||
|
||||
<div class="text-right">
|
||||
<a class="back-button text-white m20r" href="/">« Back</a>
|
||||
<a class="back-button text-white m20r" href="#!/">« Back</a>
|
||||
<button type="submit" class="button primary m0" ng-disabled="importForm.$invalid" loading="Importing">
|
||||
Import backup
|
||||
</button>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<div ng-controller="SidebarController">
|
||||
<header class="text-center">
|
||||
<div class="text-white m10v">
|
||||
<a href="/" class="db">
|
||||
<img src="../img/logo-negative-beta.svg" alt="" width="80">
|
||||
<a href="#!/addresses" class="db">
|
||||
<img src="img/logo-negative-beta.svg" alt="" width="80">
|
||||
</a>
|
||||
<small>v{{version}}</small>
|
||||
<small ng-if="$root.wallet.getNetworkName()=='livenet'">LIVENET</small>
|
||||
|
@ -39,8 +39,8 @@
|
|||
</div>
|
||||
</header>
|
||||
<ul class="off-canvas-list">
|
||||
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
||||
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
|
||||
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
||||
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
|
||||
<i class="size-24 m20r {{item.icon}}"></i> {{item.title}}
|
||||
<span class="label alert round" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
|
||||
</a>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<div ng-controller="SidebarController">
|
||||
<header class="p20">
|
||||
<div class="text-center">
|
||||
<a href="/" class="db">
|
||||
<img src="../img/logo-negative-beta.svg" alt="" width="100">
|
||||
<a href="#!/addresses" class="db">
|
||||
<img src="img/logo-negative-beta.svg" alt="" width="100">
|
||||
</a>
|
||||
<div>
|
||||
<small>v{{version}}</small>
|
||||
|
@ -12,7 +12,7 @@
|
|||
</div>
|
||||
<div class="line-sidebar"></div>
|
||||
<div>
|
||||
<a href="/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
|
||||
<a href="#!/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
|
||||
<span>{{$root.wallet.getName()}}</span>
|
||||
</a>
|
||||
<a class="button gray small side-bar right" title="Manual Refresh"
|
||||
|
@ -46,14 +46,14 @@
|
|||
<div class="line-sidebar"></div>
|
||||
</header>
|
||||
<ul class="side-nav">
|
||||
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
||||
<a href="{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
|
||||
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
||||
<a href="#!/{{item.link}}" ng-click="toggleCollapse()" class="db p20h">
|
||||
<i class="size-21 m20r {{item.icon}}"></i> {{item.title}}
|
||||
<span class="label alert round" ng-if="item.link=='transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="db p20h" title="Signout"
|
||||
<a href="#!/" class="db p20h" title="Signout"
|
||||
ng-click="signout()"><i class="size-21 m20r fi-power"></i> Signout</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
<div class="row" ng-show="!loading">
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup">
|
||||
|
@ -29,7 +29,7 @@
|
|||
ng-model="joinPasswordConfirm"
|
||||
match="joinPassword" required>
|
||||
<div class="text-right">
|
||||
<a href="/" class="back-button text-primary m20r">« Back</a>
|
||||
<a href="#!/" class="back-button text-primary m20r">« Back</a>
|
||||
<button type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
<div class="row" ng-show="!loading">
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup">
|
||||
|
@ -15,7 +15,7 @@
|
|||
</select>
|
||||
<input type="password" class="form-control" placeholder="Your password" name="openPassword" ng-model="openPassword" required>
|
||||
<div class="text-right">
|
||||
<a href="/" class="back-button text-white m20r">« Back</a>
|
||||
<a href="#!/" class="back-button text-white m20r">« Back</a>
|
||||
<button type="submit" class="button white m0" ng-disabled="openForm.$invalid || loading" loading="Opening">Open</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<div class="settings" ng-controller="SettingsController">
|
||||
<div class="row">
|
||||
<div class="large-4 columns logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup">
|
||||
|
@ -63,7 +63,7 @@
|
|||
</fieldset>
|
||||
|
||||
<div class="text-right">
|
||||
<a class="back-button text-white m20r" href="/">« Back</a>
|
||||
<a class="back-button text-white m20r" href="#!/">« Back</a>
|
||||
<button type="submit" class="button primary m0 ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
|
||||
Save
|
||||
</button>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
|
||||
<div class="row">
|
||||
<div class="large-4 columns logo-setup text-center">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<div class="large-8 columns line-dashed-setup-v">
|
||||
<div class="box-setup oh">
|
||||
|
@ -66,7 +66,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="/">« Back</a>
|
||||
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="#!/">« Back</a>
|
||||
<a ng-show="isSetupWalletPage" class="back-button m20r"
|
||||
ng-click="setupWallet()">« Back</a>
|
||||
<button ng-show="isSetupWalletPage" type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">
|
||||
|
|
|
@ -29,21 +29,21 @@
|
|||
</div>
|
||||
|
||||
<div class="box-copayer" ng-repeat="(cId, actions) in tx.peerActions">
|
||||
<a href="/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
|
||||
<a href="#!/transactions" class="has-tip" tooltip-popup-delay="1000" tooltip="{{cId === $root.wallet.getMyCopayerId() ? 'You' : $root.wallet.publicKeyRing.nicknameForCopayer(cId)}}">
|
||||
<img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{cId}}">
|
||||
</a>
|
||||
<div class="box-status">
|
||||
<span ng-repeat="(action, ts) in actions">
|
||||
<a ng-if="action == 'create'" href="/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
|
||||
<a ng-if="action == 'create'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Created {{ts | amTimeAgo}}">
|
||||
<i class="fi-crown icon-status icon-active"></i>
|
||||
</a>
|
||||
<a ng-if="action == 'seen'" href="/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
|
||||
<a ng-if="action == 'seen'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
|
||||
<i class="fi-eye icon-status icon-active"></i>
|
||||
</a>
|
||||
<a ng-if="action == 'sign'" href="/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
|
||||
<a ng-if="action == 'sign'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
|
||||
<i class="fi-check icon-status icon-active-check"></i>
|
||||
</a>
|
||||
<a ng-if="action == 'rejected'" href="/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
|
||||
<a ng-if="action == 'rejected'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Rejected {{ts | amTimeAgo}}">
|
||||
<i class="fi-x icon-status icon-active-x"></i>
|
||||
</a>
|
||||
</span>
|
||||
|
@ -82,7 +82,7 @@
|
|||
</div>
|
||||
<div class="ellipsis small">
|
||||
Transaction ID:
|
||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
|
||||
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="_blank">
|
||||
{{tx.sentTxid}}
|
||||
</a>
|
||||
</div>
|
||||
|
@ -124,7 +124,7 @@
|
|||
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
|
||||
<div class="last-transactions-header">
|
||||
<div class="large-8 columns">
|
||||
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
|
||||
<a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
|
||||
{{btx.txid}}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<div class="text-center logo-setup">
|
||||
<img src="../img/logo-negative-beta.svg" alt="Copay">
|
||||
<img src="img/logo-negative-beta.svg" alt="Copay">
|
||||
</div>
|
||||
<h1 class="text-center text-white">Browser unsupported</h1>
|
||||
<h3 class="text-center">
|
||||
|
|
Loading…
Reference in New Issue