Merge pull request #1346 from cmgustavo/bug/03-ui

Bug/03 ui
This commit is contained in:
Matias Alejo Garcia 2014-09-10 12:06:38 -03:00
commit 8662be8db9
4 changed files with 100 additions and 56 deletions

View File

@ -68,7 +68,7 @@ msgstr "Importe en"
msgid "Are you sure to delete this wallet from this computer?"
msgstr "¿Estas seguro de borrar este monedero de tu computadora?"
#: views/join.html views/open.html
#: views/join.html
msgid "Authenticating and looking for peers..."
msgstr "Autenticando y buscando compañeros..."
@ -109,6 +109,10 @@ msgstr "Navegador no soportado"
msgid "Cancel"
msgstr "Cancelar"
#: views/send.html
msgid "Certificate:"
msgstr "Certificado:"
#: views/import.html
msgid "Choose backup file from your computer"
msgstr "Seleccione el archivo backup de su computadora"
@ -125,6 +129,10 @@ msgstr "Cerrar"
msgid "Confirmations"
msgstr "Confirmaciones"
#: views/open.html
msgid "Connecting..."
msgstr "Conectando..."
#: views/warning.html
msgid "Continue anyways"
msgstr "Continuar de todas maneras"
@ -201,12 +209,12 @@ msgstr "Fondos para vacaciones en familia"
msgid "Fee"
msgstr "Tasa"
#: views/join.html
#: views/join.html views/send.html
msgid "Get QR code"
msgstr "Obtener código QR"
#: views/create.html views/import.html views/join.html views/more.html
#: views/transactions.html
#: views/copayers.html views/create.html views/import.html views/join.html
#: views/more.html views/transactions.html
msgid "Hide"
msgstr "Ocultar"
@ -296,10 +304,18 @@ msgstr "Master Private Key"
msgid "Me"
msgstr "Yo"
#: views/send.html
msgid "Merchant Data:"
msgstr "Negocio:"
#: views/create.html
msgid "Name"
msgstr "Nombre"
#: index.html
msgid "Network Error. Attempting to reconnect..."
msgstr "Error de Red. Intentando reconectar..."
#: views/settings.html
msgid ""
"Network has been fixed to <strong>{{networkName}}</strong> in this setup. "
@ -326,13 +342,13 @@ msgstr "Sin propuestas de transacciones aún."
msgid "No transactions yet."
msgstr "Aún no hay transacciones."
#: views/send.html views/modals/address-book.html
#: views/modals/address-book.html
msgid "Not valid"
msgstr "No válido"
#: views/send.html
msgid "Notes"
msgstr "Notas"
msgid "Note"
msgstr "Nota"
#: views/copayers.html
msgid "One person has"
@ -377,6 +393,10 @@ msgstr "Contraseña"
msgid "Paste wallet secret here"
msgstr "Pegar código secreto del monedero aquí"
#: views/send.html
msgid "Payment Expiration:"
msgstr "Vencimiento de Pago:"
#: views/more.html
msgid ""
"Pending Transactions Proposals will be discarted. This need to be done on "
@ -465,10 +485,6 @@ msgstr "Seleccione las firmas requeridas (*)"
msgid "Select total number of copayers (*)"
msgstr "Seleccione el total de compañeros (*)"
#: views/send.html
msgid "Send"
msgstr "Enviar"
#: views/send.html
msgid "Send Proposals"
msgstr "Enviar Propuestas"
@ -485,6 +501,10 @@ msgstr "Enviar a"
msgid "Sent"
msgstr "Enviado"
#: views/send.html
msgid "Server Says:"
msgstr "Mensaje del Servidor:"
#: views/home.html views/more.html
msgid "Settings"
msgstr "Configuración"
@ -493,8 +513,8 @@ msgstr "Configuración"
msgid "Share this secret with your other copayers"
msgstr "Compartir el código secreto con tus otros compañeros"
#: views/create.html views/import.html views/join.html views/more.html
#: views/transactions.html
#: views/copayers.html views/create.html views/import.html views/join.html
#: views/more.html views/transactions.html
msgid "Show"
msgstr "Mostrar"
@ -510,6 +530,14 @@ msgstr "Ver menos"
msgid "Sign"
msgstr "Firmar"
#: views/import.html
msgid "Skip public keys from peers"
msgstr "Ignorar claves pública de los compañeros"
#: views/import.html
msgid "Skip transaction proposals from Backup"
msgstr "Ignorar propuestas de transacciones desde la Copia de Seguridad"
#: views/import.html
msgid "Skipping fields: {{skipFields}}"
msgstr "Saltear campos: {{skipFields}}"
@ -538,6 +566,10 @@ msgstr "Dirección"
msgid "Total"
msgstr "Total"
#: views/send.html
msgid "Total amount for this transaction:"
msgstr "Cantidad total de esta transacción:"
#: views/includes/transaction.html
msgid "Transaction ID"
msgstr "ID Transacción"
@ -562,7 +594,7 @@ msgstr "Todos los fondos"
msgid "User information"
msgstr "Información de Usuario"
#: views/send.html views/modals/address-book.html
#: views/modals/address-book.html
msgid "Valid"
msgstr "Válido"
@ -630,7 +662,8 @@ msgstr "Tu contraseña"
msgid "Your wallet password"
msgstr "Contraseña de tu monedero"
#: views/create.html views/import.html views/join.html views/more.html
#: views/copayers.html views/create.html views/import.html views/join.html
#: views/more.html
msgid "advanced options"
msgstr "opciones avanzadas"
@ -686,6 +719,9 @@ msgstr "deben unirse"
msgid "{{tx.missingSignatures}} signatures missing"
msgstr "Faltan {{tx.missingSignatures}} firmas"
#~ msgid "Send"
#~ msgstr "Enviar"
#~ msgid ""
#~ "{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet"
#~ msgstr "Monedero {{requiredCopayers}}-de-{{totalCopayers}}"

View File

@ -33,11 +33,15 @@
<div ng-hide="hideAdv">
<label>
<input translate type="checkbox" class="form-control" name="skipPublicKeyRing" ng-model="skipPublicKeyRing">Skip public keys from peers
<input type="checkbox" class="form-control"
name="skipPublicKeyRing" ng-model="skipPublicKeyRing">
<span translate>Skip public keys from peers</span>
</label>
<label>
<input translate type="checkbox" class="form-control" name="skipTxProposals" ng-model="skipTxProposals">Skip transaction proposals from Backup
<input type="checkbox" class="form-control"
name="skipTxProposals" ng-model="skipTxProposals">
<span translate>Skip transaction proposals from Backup</span>
</label>
</div>

View File

@ -26,7 +26,7 @@
<input id="connectionId" type="text" class="small-9 columns"
placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
</div>
<div class="small-2 columns" ng-hide="disableScanner" ng-hide="showScanner">
<div class="small-2 columns" ng-hide="showScanner || disableScanner">
<a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
</div>
<div class="small-2 columns" ng-show="showScanner">

View File

@ -8,28 +8,28 @@
<div ng-show="txs.length != 0" class="large-12 line-dashed" style="padding: 0;"></div>
<h1>{{title|translate}}</h1>
<div class="row collapse m0">
<div class="large-6 columns">
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
<div class="row">
<div class="row collapse">
<div class="large-12 columns">
<div class="row collapse">
<label for="address">To address
<small ng-hide="!sendForm.address.$pristine || address">required</small>
<small class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
<small class="has-error" ng-show="sendForm.address.$invalid && address">
not valid</small>
<label for="address"><span translate>To address</span>
<small translate ng-hide="!sendForm.address.$pristine || address">required</small>
<small translate class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
<small translate class="has-error" ng-show="sendForm.address.$invalid && address">not valid</small>
</label>
<div class="small-10 columns">
<input type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
placeholder="Send to" ng-model="address" ng-change="onChanged()" valid-address required>
placeholder="{{'Send to'|translate}}" ng-model="address" ng-change="onChanged()" valid-address required>
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
</div>
<div class="small-2 columns" ng-hide="showScanner">
<div class="small-2 columns" ng-hide="showScanner || disableScanner">
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
</div>
<div class="small-2 columns" ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
<a translate class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
</div>
</div>
<div id="scanner" class="row" ng-if="showScanner">
@ -39,7 +39,7 @@
<div id="file-input-wrapper" class="btn btn-primary">
<span class="pull-left text-centered">
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
Get QR code
<span translate>Get QR code</span>
</span>
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
</div>
@ -52,30 +52,33 @@
</div>
</div>
<div class="row">
<div class="large-6 medium-6 columns">
<div class="row collapse">
<div class="large-5 medium-5 columns">
<div class="row collapse">
<label for="amount">Amount
<small ng-hide="!sendForm.amount.$pristine">required</small>
<small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">Valid</small>
<small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
Not valid
<label for="amount"><span translate>Amount</span>
<small translate ng-hide="!sendForm.amount.$pristine">required</small>
<small translate class="is-valid"
ng-show="!sendForm.amount.$invalid &&
!sendForm.amount.$pristine">valid!</small>
<small translate class="has-error"
ng-show="sendForm.amount.$invalid &&
!sendForm.amount.$pristine && !notEnoughAmount">not valid
</small>
<small ng-show="notEnoughAmount" class="has-error">Insufficient funds</small>
<small translate ng-show="notEnoughAmount" class="has-error">Insufficient funds</small>
</label>
<div class="small-9 columns">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || $root.merchantError"
name="amount" placeholder="Amount" ng-model="amount"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
min="{{minAmount}}" max="10000000000" enough-amount required
autocomplete="off"
>
<small class="icon-input" ng-show="!sendForm.amount.$invalid && amount"><i class="fi-check"></i></small>
<small class="icon-input" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount"><i class="fi-x"></i></small>
<a class="small input-note" title="Send all funds"
<a class="small input-note" title="{{'Send all funds'|translate}}"
ng-show="$root.availableBalance > 0 && (!$root.merchant || +$root.merchant.total === 0)"
ng-click="topAmount(sendForm)">
Use all funds ({{getAvailableAmount()}} {{$root.unitName}})
<span translate>Use all funds</span> ({{getAvailableAmount()}} {{$root.unitName}})
</a>
</div>
<div class="small-3 columns">
@ -83,13 +86,13 @@
</div>
</div>
</div>
<div class="large-6 medium-6 columns">
<div class="large-5 medium-5 columns">
<div class="row collapse">
<label for="alternative">Amount in {{ alternativeName }} </label>
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
<div class="small-9 columns">
<input type="number" id="alternative_amount"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) || $root.merchantError"
name="alternative" placeholder="Amount" ng-model="alternative"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative"
required
autocomplete="off"
>
@ -101,22 +104,22 @@
</div>
</div>
<div class="row" ng-show="wallet.isShared()">
<div class="row collapse" ng-show="wallet.isShared()">
<div class="large-12 columns">
<div class="row collapse">
<label for="comment">Note
<small ng-hide="!sendForm.comment.$pristine">optional</small>
<small class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
<label for="comment"><span translate>Note</span>
<small translate ng-hide="!sendForm.comment.$pristine">optional</small>
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<div class="large-12 columns">
<textarea id="comment" ng-disabled="loading"
name="comment" placeholder="Leave a private message to your copayers" ng-model="commentText" ng-maxlength="100"></textarea>
name="comment" placeholder="{{'Leave a private message to your copayers'|translate}}" ng-model="commentText" ng-maxlength="100"></textarea>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row collapse">
<div class="large-5 medium-3 small-4 columns">
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading">
Send
@ -125,15 +128,16 @@
</div>
</form>
</div>
</div><!-- end of row -->
<div class="large-6 columns show-for-large-up" ng-show="!!$root.merchant">
<div class="send-note">
<h6>Send to</h6>
<h6 translate>Send to</h6>
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}"
title="{{$root.merchant.request_url}}">
{{$root.merchant.domain}}&nbsp;
</p>
<h6>Total amount for this transaction:</h6>
<h6 translate>Total amount for this transaction:</h6>
<p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}">
<b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.unitName}}
<small ng-if="isRateAvailable">
@ -145,24 +149,24 @@
</small>
</p>
<div ng-show="wallet.isShared()">
<h6>Note</h6>
<h6 translate>Note</h6>
<p ng-class="{'hidden': !commentText}">{{commentText}}</p>
</div>
<div ng-show="!!$root.merchant">
<h6>Merchant Data:</h6>
<h6 translate>Merchant Data:</h6>
<p class="text-gray">
Note: This is a payment protocol transaction.
</p>
<h6>Server Says:</h6>
<h6 translate>Server Says:</h6>
<p class="text-gray">
{{$root.merchant.pr.pd.memo}}
</p>
<h6>Certificate:</h6>
<h6 translate>Certificate:</h6>
<p class="text-gray">
<span ng-show="!!$root.merchant.pr.ca">{{$root.merchant.pr.ca}}</span>
<span ng-show="!$root.merchant.pr.ca" style="color:red;weight:bold;">Untrusted</span>
</p>
<h6>Payment Expiration:</h6>
<h6 translate>Payment Expiration:</h6>
<p class="text-gray">
{{$root.merchant.expiration}}
</p>
@ -172,7 +176,7 @@
<div class="large-12 columns line-dashed">
<h2 translate>Address Book</h2>
<p translate class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
<p translate class="text-gray m15b" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
<table class="large-12 medium-12 small-12" ng-show="showAddressBook()">
<thead>
<tr>