fixes: createProfile, home and settings. Cleaning css

This commit is contained in:
Gustavo Maximiliano Cortez 2014-10-20 20:46:49 -03:00 committed by Matias Alejo Garcia
commit 420d5f253c
5 changed files with 95 additions and 148 deletions

View file

@ -1,10 +1,10 @@
<div class="createProfile" ng-controller="CreateProfileController">
<div data-alert class="loading-screen" ng-show="retreiving">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
Retreiving information from storage...
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Retreiving information from storage...</span>
</div>
<div class="large-12 medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
@ -13,13 +13,13 @@
<div class="left">
<i class="size-36 fi-alert m10r"></i>
</div>
<div class="size-12">
<b>Copay now needs a profile to access wallets. </b>
<div class="size-12" translate>
<b>Copay now needs a profile to access wallets.</b>
You can import your current wallets after creating your frofile
</div>
</div>
<div class="box-setup">
<h1 class="m20b" translate >Create Profile</h1>
<h1 translate>Create Profile</h1>
<form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
<div class="row collapse">
<div class="small-12 columns">
@ -46,10 +46,10 @@
<small class="icon-input"
ng-show="profileForm.repeatpassword.$dirty &&
profileForm.repeatpassword.$invalid"><i class="fi-x"></i></small>
<p class="m15b text-gray size-12"
<p class="text-warning size-12"
ng-show="profileForm.repeatpassword.$dirty &&
profileForm.repeatpassword.$invalid">
<i class="fi-x m5r"></i>
<i class="fi-x"></i>
{{'Passwords must match'|translate}}
</p>
</div>
@ -62,12 +62,20 @@
</form>
<div class="box-setup-footer">
<div class="left">
<a translate class="text-gray" href="#"><i class="m5r
size-14 fi-arrow-left"></i>Back to Copay.io</a>
<a ng-show="!anyProfile" class="text-gray" href="https://copay.io">
<i class="m5r fi-arrow-left"></i>
<span translate>Back to</span> copay.io
</a>
<a ng-show="anyProfile" class="text-gray" href="#!/">
<i class="fi-arrow-left"></i>
<span translate>Back</span>
</a>
</div>
<div class="right">
<a class="right size-12 text-gray" href="#!/settings"><i class="m5r
size-14 fi-wrench"></i><span translate>Settings</span></a>
<a class="right size-12 text-gray" href="#!/settings">
<i class="fi-wrench"></i>
<span translate>Settings</span>
</a>
</div>
</div>
</div>

View file

@ -2,36 +2,38 @@
<div data-alert class="loading-screen" ng-show="retreiving">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
Retreiving information from storage...
<span translate>Retreiving information from storage...</span>
</div>
<div class="large-12 medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="box-setup">
<h1 translate >Sign in to <b> Copay </b></h1>
<h1><span translate>Sign in to</span> <b>Copay</b></h1>
<form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>
<input type="email" ng-model="email" class="form-control"
name="email" placeholder="Email" required>
<input type="password" ng-model="password" class="form-control"
name="password" placeholder="Password" required>
<div class="text-right">
<button translate type="submit" class="button primary radius expand m0"
ng-disabled="loginForm.$invalid || loading">
Sign in
</button>
</div>
<button translate type="submit" class="button primary radius expand m0"
ng-disabled="loginForm.$invalid || loading">
Sign in
</button>
</form>
<div class="box-setup-footer">
<div class="left">
<a translate class="button-setup text-gray" href="#!/createProfile"><i class="m5r
size-14 fi-torso"></i>Create a profile</a>
<a class="button-setup text-gray" href="#!/createProfile">
<i class="fi-torso"></i>
<span translate>Create a profile</span>
</a>
</div>
<div class="right m5t">
<a class="right size-12 text-gray" href="#!/settings"><i class="m5r
size-14 fi-wrench"></i><span translate>Settings</span></a>
<div class="right m10t">
<a class="text-gray" href="#!/settings">
<i class="fi-wrench"></i>
<span translate>Settings</span>
</a>
</div>
</div>
</div>

View file

@ -1,39 +1,40 @@
<div class="settings" ng-controller="SettingsController">
<div class="row">
<div class="large-4 columns logo-setup">
<div class="large-4 large-centered medium-6 medium-centered columns">
<div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup">
<h1 class="text-white line-sidebar-b">{{title|translate}}</h1>
<form name="settingsForm">
<fieldset>
<legend translate>Language</legend>
<select class="form-control" ng-model="selectedLanguage" ng-options="o.name for o in availableLanguages" required>
</select>
</fieldset>
<fieldset>
<legend translate>Insight API server</legend>
<label for="insightLivenet">Livenet</label>
<small translate class="has-error" ng-show="settingsForm.insightLivenet.$invalid">not valid</small>
<input type="text" ng-model="insightLivenet" class="form-control" name="insightLivenet" valid-url required>
<label for="insightTestnet">Testnet</label>
<small translate class="has-error" ng-show="settingsForm.insightTestnet.$invalid">not valid</small>
<input type="text" ng-model="insightTestnet" class="form-control" name="insightTestnet" valid-url required>
<div class="box-setup">
<h1>{{title|translate}}</h1>
<form name="settingsForm">
<fieldset>
<legend translate>Language</legend>
<select class="form-control" ng-model="selectedLanguage" ng-options="o.name for o in availableLanguages" required>
</select>
</fieldset>
<fieldset>
<legend translate>Insight API server</legend>
<label for="insightLivenet">Livenet</label>
<small translate class="has-error" ng-show="settingsForm.insightLivenet.$invalid">not valid</small>
<input type="text" ng-model="insightLivenet" class="form-control" name="insightLivenet" valid-url required>
<p translate class="small">
Insight API server is open-source software. You can run your own instances, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
</p>
</fieldset>
<div class="text-right m20t">
<a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
<button translate type="submit" class="button primary m0 ng-binding" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
Save
</button>
<label for="insightTestnet">Testnet</label>
<small translate class="has-error" ng-show="settingsForm.insightTestnet.$invalid">not valid</small>
<input type="text" ng-model="insightTestnet" class="form-control" name="insightTestnet" valid-url required>
<div translate class="small">
Insight API server is open-source software. You can run your own instances, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
</div>
</form>
</fieldset>
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
Save
</button>
</form>
<div class="box-setup-footer">
<a class="text-gray" href="#!/">
<i class="fi-arrow-left"></i>
<span translate>Back</span>
</a>
</div>
</div>
</div>