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

Merge pull request #2259 from matiu/feature/wp9

Browse source 
Feature/wp9
This commit is contained in:
Ivan Socolsky 2015-01-04 13:01:47 -03:00
commit e513059d3e
33 changed files with 526 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

7
views/create.html
View file

@ -3,11 +3,6 @@
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
</div>
<div class="setup" ng-show="!loading && !$root.starting">
<div class="row hide-for-large-up">
<div class="medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row">
<div class="large-12 columns">
@ -24,7 +19,7 @@
<div class="panel">
<label><span translate>Wallet name</span>
<div class="input">
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true">
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true">
</div>
</label>
<div class="row">

81
views/createProfile.html
View file

@ -4,34 +4,34 @@
</div>
<div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!$root.starting && !askForPin">
<div class="logo-setup hide-for-small-only">
<div class="logo-setup hide-for-small-only" ng-hide="hideForWP">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
</div>
<div>
<div class="clipo" ng-show="createStep == 'storage' ">
<div class="clipo" ng-show="createStep == 'storage' && !hideForWP ">
<img src="img/clipo-signup1.png" alt="clipo" width="311">
</div>
<div ng-show="createStep == 'email'">
<div class="clipo" ng-if="useLocalstorage">
<div class="clipo" ng-if="useLocalstorage && !hideForWP" >
<img src="img/clipo-signup2-1.png" alt="clipo" width="373">
</div>
<div class="clipo" ng-if="!useLocalstorage">
<div class="clipo" ng-if="!useLocalstorage && !hideForWP">
<img src="img/clipo-signup2.png" alt="clipo" width="373">
</div>
<h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
<h2 ng-if="useLocalstorage"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage" ng-hide="hideForWP"> Creating in the cloud </h2>
<h2 ng-if="useLocalstorage" ng-hide="hideForWP"> Creating on this device </h2>
</div>
<div ng-show="createStep == 'pass'">
<div class="clipo">
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-signup3.png" alt="clipo" width="380">
</div>
<h2 ng-if="useLocalstorage"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage"> Creating in the cloud </h2>
<div class="text-gray text-center m20b">{{userOrEmail}}</div>
<h2 ng-if="useLocalstorage" ng-hide="hideForWP"> Creating on this device </h2>
<h2 ng-if="!useLocalstorage" ng-hide="hideForWP"> Creating in the cloud </h2>
<div class="text-gray text-center m20b" ng-hide="hideForWP">{{userOrEmail}}</div>
</div>
<div class="box-notification" ng-show="error && !passwordStrength">
@ -113,7 +113,7 @@
<form ng-show="createStep == 'email'" name="emailForm" ng-submit="setEmailOrUsername(emailForm)" novalidate>
<div class="input" ng-if="useEmail">
<input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile">
<input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile" ng-focus="formFocus()">
<i class="icon-email"></i>
<div class="icon-input" ng-if="useEmail">
<span translate class="has-error size-12" ng-show="emailForm.email.$invalid &&
@ -128,7 +128,7 @@
</div>
<div class="input" ng-if="!useEmail">
<input type="text" ng-model="username" class="form-control fi-user" name="username" placeholder="Username" required auto-focus>
<input type="text" ng-model="username" class="form-control fi-user" name="username" placeholder="Username" required auto-focus="!isMobile" ng-focus="formFocus()">
<i class="icon-person"></i>
</div>
@ -149,10 +149,13 @@
<form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate>
<div class="box-notification" ng-show="passwordStrength">
<div class="box-icon" style="background-color:{{passwordStrength.color}}">
<i class="fi-x size-24" ng-if="passwordStrength.strength< minPasswordStrength"></i>
<i class="fi-check size-24" ng-if="passwordStrength.strength >= minPasswordStrength"></i>
</div>
<!-- if you change this, check it on WP...-->
<div class="box-icon" ng-if="passwordStrength.strength< minPasswordStrength" style="background-color:#dd514c">
<i class="fi-x size-24"></i>
</div>
<div class="box-icon" ng-if="passwordStrength.strength >= minPasswordStrength" style="background-color:#16A085">
<i class="fi-check size-24"></i>
</div>
<span class="size-14" >
Password Strength: {{passwordStrength.message}}
</span>
@ -160,13 +163,13 @@
<div class="input">
<input id="password" type="password" ng-model="$parent.password" class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" >
<input id="password" type="password" ng-model="$parent.password" class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" ng-focus="formFocus()" >
<i class="icon-locked"></i>
</div>
<div class="input">
<input type="password" ng-model="repeatpassword" class="input form-control" name="repeatpassword" placeholder="{{'Repeat password'|translate}}" match="password" required>
<input type="password" ng-model="repeatpassword" class="input form-control" name="repeatpassword" placeholder="{{'Repeat password'|translate}}" match="password" required ng-focus="formFocus()">
<i class="icon-locked"></i>
<div class="icon-input">
<span translate class="has-error size-12" ng-show="passForm.repeatpassword.$dirty &&
@ -198,7 +201,7 @@
</div>
<div class="large-4 large-centered medium-6 medium-centered columns m20b" ng-show="!$root.starting && askForPin">
<div class="clipo">
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-pin.png" alt="clipo" width="380">
</div>
@ -212,31 +215,29 @@
</div>
<form name="setPinForm" novalidate>
<div class="input" ng-show="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
<i class="icon-locked"></i>
<div class="input" ng-if="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked" ng-hide="isWindowsPhoneApp"></i>
</div>
<div class="input" ng-show="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
<i class="icon-locked"></i>
<div class="input" ng-if="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked" ng-hide="isWindowsPhoneApp"></i>
</div>
<div class="box-setup-footer row collapse">
<div class="large-6 medium-6 small-6 columns">
<a class="button secondary radius m0" ng-click="createDefaultWallet()">
<span translate>Skip</span>
</a>
<div class="box-setup-footer row collapse">
<div class="large-6 medium-6 small-6 columns">
<a class="button secondary radius m0" ng-click="createDefaultWallet()">
<span translate>Skip</span>
</a>
</div>
<div class="large-6 medium-6 small-6 columns text-right">
<button translate ng-click="createPin(setPinForm.repeatpin.$modelValue)" class="button primary radius expand m0"
ng-disabled="setPinForm.$invalid || error">
OK
</button>
</div>
</div>
<div class="large-6 medium-6 small-6 columns text-right">
<button translate ng-click="createPin(setPinForm.repeatpin.$modelValue)" class="button primary radius expand m0"
ng-disabled="setPinForm.$invalid || error">
OK
</button>
</div>
</div>
</form>
</form>
</div>
</div>

22
views/home.html
View file

@ -5,7 +5,7 @@
</div>
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!$root.starting">
<div class="logo-setup" ng-show="!$root.iden">
<div class="logo-setup" ng-show="!$root.iden && !hideForWP">
<img src="img/logo-negative-beta.svg" alt="Cop ay" width="100">
<div ng-include="'views/includes/version.html'"></div>
</div>
@ -38,11 +38,11 @@
<form name="setPinForm" ng-model="setPinForm" novalidate>
<div class="input" ng-show="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
<input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
<div class="input" ng-show="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
<input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2 && !isWindowsPhoneApp" ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
@ -65,7 +65,7 @@
</div>
<div ng-if='$root.hasPin && !$root.iden'>
<div class="clipo">
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-pin-enter.png" alt="clipo" width="300">
</div>
<form name="pinForm" novalidate>
@ -79,7 +79,7 @@
</div>
<div class="input">
<input id="pin" type="tel" ng-model="pin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Pin number" name="pin" required>
<input id="pin" type="tel" ng-model="pin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Pin number" name="pin" required ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
@ -101,7 +101,7 @@
</div>
<div ng-if='!$root.hasPin && !askForPin && !$root.iden'>
<div class="clipo">
<div class="clipo" ng-hide="hideForWP">
<img src="img/clipo-signin.png" alt="clipo" width="310">
</div>
<div class="p10 m20b size-14 bg-success text-white" ng-show="anyWallet && !confirmedEmail && !error">
@ -131,24 +131,28 @@
</div>
<div class="input" ng-if="!usingLocalStorage">
<input type="email" ng-model="email" class="form-control" name="email" placeholder="Email" required show-focus="!isMobile">
<input type="email" ng-model="email" class="form-control" name="email" placeholder="Email" required show-focus="!isMobile" ng-focus="formFocus()">
<i class="icon-email"></i>
</div>
<div class="input" ng-if="usingLocalStorage">
<input type="text" ng-model="email" class="form-control" name="email" placeholder="Username" required show-focus="!isMobile">
<input type="text" ng-model="email" class="form-control" name="email" placeholder="Username" required show-focus="!isMobile" ng-focus="formFocus()">
<i class="icon-person"></i>
</div>
<div class="input">
<input type="password" ng-model="password" class="form-control" name="password" placeholder="Password" required>
<input type="password" ng-model="password" class="form-control" name="password" placeholder="Password" required ng-focus="formFocus()">
<i class="icon-locked"></i>
</div>
<button translate type="submit" class="button primary radius expand m0" ng-disabled="loginForm.$invalid">
Sign in
{{hideAll}}
</button>
</form>
aasdas
<div ng-if="usingLocalStorage" class="text-gray size-12 m10v">
* Using this device storage. Change to cloud storage on 'settings'.
</div>

40
views/send.html
View file

@ -1,6 +1,6 @@
<div class="send" ng-controller="SendController" ng-init="init()">
<div class="row hide-for-large-up" >
<div class="row hide-for-large-up" ng-hide="$root.wpInputFocused" >
<div class="large-10 medium-10 small-9 columns">
<h1>{{$root.title}}</h1>
</div>
@ -28,12 +28,28 @@
</div>
</div>
</div>
<div class="row" ng-show="creatingTX">
<div class="large-12 columns">
<div class="panel">
<div class="box-notification">
<div class="box-icon secondary">
<i class="fi-bitcoin-circle icon-rotate spinner size-24"></i>
</div>
<span class="text-secondary size-14">
Creating Transaction...
</span>
</div>
</div>
</div>
</div>
<div class="row" ng-show="!fetchingURL">
<div class="row" ng-show="!fetchingURL && !creatingTX">
<div class="large-8 large-centered columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="panel">
<div class="box-notification" ng-show="error">
<div class="box-notification" ng-show="error && !hideForWP ">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
@ -52,10 +68,10 @@
<a class="close-notification text-success" ng-click="success=null">&#215;</a>
</div>
<div ng-if="!_merchantData">
<div ng-if="!_merchantData" ng-hide="hideAddress">
<div class="row collapse">
<label for="address" class="left">
<label for="address" class="left" >
<span translate>To</span>
</label>
@ -73,13 +89,13 @@
</div>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="loading || lockAddress" placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required>
<input type="text" id="address" name="address" ng-disabled="loading || lockAddress" placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required ng-focus="formFocus('address')" ng-blur="formFocus(false)">
<a class="postfix" ng-click="openAddressBook()"><i class="fi-address-book size-24"></i></a>
</div>
<div id="scanner" class="row" ng-if="showScanner" ng-include="'views/includes/scanner.html'">
</div>
</div>
<div ng-show="_merchantData">
<div ng-show="_merchantData && !hideAddress">
<div class="row collapse" ng-click="openPPModal(_merchantData)">
<label for="domain">
@ -93,7 +109,7 @@
</div>
</div>
<div class="row" ng-init="showAlternative = false">
<div class="row" ng-init="showAlternative = false" ng-hide="hideAmount">
<div class="large-12 medium-12 columns">
<div class="m5b right" ng-hide="sendForm.amount.$pristine">
<span translate class="has-error right size-12" ng-show="sendForm.amount.$invalid">
@ -110,7 +126,7 @@
</label>
<div class="input">
<input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off">
<input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="formFocus('amount')" ng-blur="formFocus(false)">
<a class="postfix" ng-click="showAlternative = true">{{$root.wallet.settings.unitName}}</a>
</div>
</div>
@ -118,7 +134,7 @@
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }}
</label>
<div class="input">
<input type="number" id="alternative" ng-disabled="loading || !isRateAvailable || lockAmount" name="alternative" placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off">
<input type="number" id="alternative" ng-disabled="loading || !isRateAvailable || lockAmount" name="alternative" placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off" ng-focus="formFocus('amount')" ng-blur="formFocus(false)">
<a class="postfix" ng-click="showAlternative = false"> {{ alternativeName }}</a>
</div>
</div>
@ -131,8 +147,8 @@
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<div class="input">
<textarea id="comment" ng-disabled="loading" name="comment" ng-if="isShared" placeholder="Leave a private message to your copayers" ng-maxlength="100" ng-model="_comment"></textarea>
<textarea id="comment" ng-disabled="loading" name="comment" ng-if="!isShared" placeholder="Add a private comment to identify the transaction" ng-maxlength="100" ng-model="_comment"></textarea>
<textarea id="comment" ng-disabled="loading" name="comment" ng-if="isShared" placeholder="Leave a private message to your copayers" ng-maxlength="100" ng-model="_comment" ng-focus="formFocus('msg')" ng-blur="formFocus(false)"></textarea>
<textarea id="comment" ng-disabled="loading" name="comment" ng-if="!isShared" placeholder="Add a private comment to identify the transaction" ng-maxlength="100" ng-model="_comment" ng-focus="formFocus('msg')" ng-blur="formFocus(false)"></textarea>
</div>
</div>
</div>