From 5267c2ad48c4efa7e036804a4914d757127ff65c Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Sun, 20 Apr 2014 20:21:54 -0300
Subject: [PATCH] WIP: reorder main menu. Renamed home for addresses. Fix
 header titles

---
 css/main.css                             |  4 ++--
 index.html                               | 15 +++++++--------
 js/app.js                                |  4 ++--
 js/controllers/{home.js => addresses.js} |  2 +-
 js/controllers/header.js                 |  8 ++++----
 js/routes.js                             |  4 ++--
 6 files changed, 18 insertions(+), 19 deletions(-)
 rename js/controllers/{home.js => addresses.js} (93%)

diff --git a/css/main.css b/css/main.css
index 17e58a215..3a034f86d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -86,7 +86,7 @@ body {
   color: #111;
 }*/
 
-.home .panel {
+.addresses .panel {
   font-size: 0.9rem;
 }
 
@@ -118,7 +118,7 @@ body {
   border: none;
 }
 
-.home .panel:hover {
+.addresses .panel:hover {
   background: #efefef;
 }
 
diff --git a/index.html b/index.html
index 8f562e44d..7071f272a 100644
--- a/index.html
+++ b/index.html
@@ -208,9 +208,9 @@
     
     
 
-    <!-- HOME -->
-    <script type="text/ng-template" id="home.html">
-      <div class="home" data-ng-controller="HomeController">
+    <!-- ADDRESS -->
+    <script type="text/ng-template" id="addresses.html">
+      <div class="addresses" data-ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
         <h3>Address</h3>
         <div class="row">
@@ -221,8 +221,7 @@
             <qrcode size="160" data="{{selectedAddr}}"></qrcode>
             <p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} BTC </strong> </p>
           </div>
-          <div class="large-1 columns"> </div>
-          <div class="large-2 columns">
+          <div class="large-3 columns text-center">
             <p> Create a New <strong> Address </strong> </p>
             <button class="secondary round expand" ng-click="newAddr()"> Create </button>
           </div>
@@ -343,7 +342,7 @@
       <div class="send" data-ng-controller="SendController">
         <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="small-6 large-centered columns">
-            <h1>{{title}}</h1>
+            <h3>{{title}}</h3>
             <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
               <div class="row">
                 <div class="large-12 columns">
@@ -395,7 +394,7 @@
     <!-- BACKUP -->
     <script type="text/ng-template" id="backup.html">
       <div class="backup" data-ng-controller="BackupController">
-        <h2>{{title}}</h2>
+        <h3>{{title}}</h3>
         <div class="row text-center">
           <div class="large-4 columns">
             <a class="panel box-backup" ng-click="download()">
@@ -452,7 +451,7 @@
     <script src="js/services/controllerUtils.js"></script>
 
     <script src="js/controllers/header.js"></script>
-    <script src="js/controllers/home.js"></script>
+    <script src="js/controllers/addresses.js"></script>
     <script src="js/controllers/transactions.js"></script>
     <script src="js/controllers/send.js"></script>
     <script src="js/controllers/backup.js"></script>
diff --git a/js/app.js b/js/app.js
index e8bbf2fdf..c955f458e 100644
--- a/js/app.js
+++ b/js/app.js
@@ -5,7 +5,7 @@ angular.module('copay',[
   'mm.foundation',
   'monospaced.qrcode',
   'copay.header',
-  'copay.home',
+  'copay.addresses',
   'copay.transactions',
   'copay.send',
   'copay.backup',
@@ -18,7 +18,7 @@ angular.module('copay',[
 ]);
 
 angular.module('copay.header', []);
-angular.module('copay.home', []);
+angular.module('copay.addresses', []);
 angular.module('copay.transactions', []);
 angular.module('copay.send', []);
 angular.module('copay.backup', []);
diff --git a/js/controllers/home.js b/js/controllers/addresses.js
similarity index 93%
rename from js/controllers/home.js
rename to js/controllers/addresses.js
index edacdc467..d7955ef80 100644
--- a/js/controllers/home.js
+++ b/js/controllers/addresses.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.home').controller('HomeController',
+angular.module('copay.addresses').controller('AddressesController',
   function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Home';
     $scope.oneAtATime = true;
diff --git a/js/controllers/header.js b/js/controllers/header.js
index d6680e76b..754ab8dfd 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -3,13 +3,13 @@
 angular.module('copay.header').controller('HeaderController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils) {
     $scope.menu = [{
-      'title': 'Home',
-      'icon': 'fi-home',
-      'link': '#/home'
-    }, {
       'title': 'Copayers',
       'icon': 'fi-torsos-all',
       'link': '#/peer'
+    }, {
+      'title': 'Addresses',
+      'icon': 'fi-address-book',
+      'link': '#/addresses'
     }, {
       'title': 'Transactions',
       'icon': 'fi-loop',
diff --git a/js/routes.js b/js/routes.js
index 5c655b208..9fb2085f5 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -15,8 +15,8 @@ angular
       .when('/setup', {
         templateUrl: 'setup.html' 
       })
-      .when('/home', {
-        templateUrl: 'home.html'
+      .when('/addresses', {
+        templateUrl: 'addresses.html'
       })
       .when('/join/:id', {
         templateUrl: 'join.html'