transations working, new schema

public/index.html

@@ -21,27 +21,20 @@
 
     <div class="off-canvas-wrap" id="off-canvas-wrap">
       <div class="inner-wrap">
-
-        <div ui-view="topbar"></div>
         <div ng-include="'views/includes/sidebar.html'" ng-if="index.hasProfile"></div>
 
         <div notifications="right top"></div> 
         <div ng-include="'views/includes/password.html'" ng-if="index.askPassword"
 ></div>
-
-
-        <section 
-          class="animation-slide"
-          ng-class="{
-          'main': index.hasProfile, 
-          'main-dark': mainDark, 
-          'animation-left': index.slideLeft, 
-          'animation-right': index.slideRight,
-          'animation-up': index.slideUp,
-          'animation-down': index.slideDown
-          }" 
-          ui-view="main"></section>
-        <div ui-view="menu" ng-if="!index.noFocusedWallet && !$root.hideMenuBar"></div>
+        <div id="sectionContainer">
+          <div id="mainSection">
+            <section ui-view="main"
+              ng-class="{
+                'main': index.hasProfile, 
+                'main-dark': mainDark, 
+              }"></section>
+          </div>
+        </div>
         <a class="close-menu" ng-click="index.closeMenu()"></a>
 
       </div>

public/views/backup.html

@@ -1,3 +1,10 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Backup'; goBackToState = 'preferences'">
+</div>
+
+
 
 <div class="content p20v" ng-controller="backupController as backup">
   <div class="row m20t">

public/views/includes/topbar.html

@@ -3,21 +3,22 @@
     <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet"
       ng-click="index.openMenu()"><i class="fi-list size-24"></i>
     </a>
-    <a ng-show="goBackToState"
+    <a ng-show="goBackToState" 
       ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
       <span class="text-back">{{'Back'|translate}}</span>
     </a>
-  </section>
 
-  <section class="right-small" ng-show="!goBackToState">
-    <a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
-      ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
-    <a ng-show="closeToHome" class="p10"
+    <a ng-show="closeToHome" class="p10 "
       ng-click="topbar.goHome(); closeToHome = null">
       <span class="text-close">{{'Close'|translate}}</span>
     </a>
   </section>
 
+  <section class="right-small" ng-show="showCamera">
+    <a id="camera-icon" ng-show="index.isComplete" class="p10"
+      ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
+  </section>
+
   <section class="middle tab-bar-section">
     <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4B6178' : index.backgroundColor}">
       {{(titleSection|translate) || index.walletName}}

public/views/preferences.html

@@ -1,3 +1,11 @@
+
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Preferences'; closeToHome = true">
+</div>
+
+
 <div class="content preferences" ng-controller="preferencesController as preferences">
 
   <ul class="no-bullet m0 size-14">

public/views/preferencesAbout.html

@@ -1,3 +1,9 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='About Copay'; goBackToState = 'preferences'">
+</div>
+
 <div class="content p20v" ng-controller="preferencesAbout as about">
   <ul class="no-bullet m0 size-14">
     <div class="text-center small-5 small-centered columns m20b" >

public/views/preferencesAdvanced.html

@@ -1,3 +1,9 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Advanced'; goBackToState = 'preferences'">
+</div>
+
 <div class="content preferences" ng-controller="preferencesAdvancedController as preferences">
 
   <ul class="no-bullet m0 size-14">

public/views/preferencesAltCurrency.html

@@ -1,3 +1,11 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Alternative Currency'; goBackToState = 'preferences'">
+</div>
+
+
+
 <div class="content preferences" ng-controller="preferencesAltCurrencyController as prefAltCurrency">
   <div ng-repeat="altCurrency in prefAltCurrency.alternativeOpts" ng-click="prefAltCurrency.save(altCurrency)" class="line-b p20 size-14">
     <span>{{altCurrency.name}}</span>

public/views/preferencesBwsUrl.html

@@ -1,3 +1,11 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Bitcore Wallet Service'; goBackToState = 'preferences'">
+</div>
+
+
+
 <div class="content preferences p20v" ng-controller="preferencesBwsUrlController as prefBwsUrl">
   <form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
     <label>Bitcore Wallet Service URL</label>

public/views/preferencesColor.html

@@ -1,3 +1,11 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Color'; goBackToState = 'preferences'">
+</div>
+
+
+
 <div class="content preferences" ng-controller="preferencesColorController as p">
   <div ng-repeat="c in p.colorOpts" ng-click="p.save(c)" class="line-b p20 size-14">
     <span ng-style="{'color': c}">&block;</span>

public/views/preferencesDeleteWallet.html

@@ -1,3 +1,10 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Delete Wallet'; goBackToState = 'preferencesAdvanced'">
+</div>
+
+
 <div class="content p20v" ng-controller="preferencesDeleteWalletController as preferences">
   <h4 class="text-warning text-center m0" translate>Warning!</h4>
   <div class="box-notification" ng-show="preferences.error" >

public/views/preferencesLogs.html

@@ -1,3 +1,11 @@
+<div 
+  class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Logs'; goBackToState = 'about'">
+</div>
+
+
+
 <div class="content p20v" ng-controller="preferencesLogs as logs">
 
   <div class="row columns">

public/views/walletHome.html

@@ -1,5 +1,10 @@
-<div ng-controller="walletHomeController as home">
 
+<div class="topbar-container" 
+  ng-include="'views/includes/topbar.html'"
+  ng-init="showCamera = true">
+</div>
+
+<div ng-controller="walletHomeController as home">
   <div class="row columns m20tp" ng-show="index.noFocusedWallet">
     <div class="text-center text-warning m20b">
       <i class="fi-alert"></i> <span translate>You do not have any wallet</span>
@@ -448,3 +453,5 @@
 
   </div>
 </div>
+<div class="extra-margin-bottom"></div>
+<div ng-include="'views/includes/menu.html'"></div>