From 94c9be1a82894cd51fe98d6559ef6c24fa0515db Mon Sep 17 00:00:00 2001
From: arnaucode <idoctnef@openmailbox.org>
Date: Tue, 27 Jun 2017 13:51:09 +0200
Subject: [PATCH] home, notifications, new travel buttons moved to top bar

---
 www/js/app.js           |  4 ++--
 www/templates/main.html |  4 ++--
 www/templates/menu.html | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index 6738fa4..3064e09 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -6,9 +6,9 @@
 // 'starter.controllers' is found in controllers.js
 
 
-var urlapi = "http://localhost:3000/api/";
+//var urlapi = "http://localhost:3000/api/";
 //var urlapi = "http://192.168.1.36:3000/api/";
-//var urlapi = "http://51.255.193.106:3000/api/";
+var urlapi = "http://51.255.193.106:3000/api/";
 
 angular.module('starter', [
     'ionic',
diff --git a/www/templates/main.html b/www/templates/main.html
index 4a23e39..dfdcede 100644
--- a/www/templates/main.html
+++ b/www/templates/main.html
@@ -29,13 +29,13 @@
       <i class="icon ion-settings"></i>
         {{'Settings' | translate }}
       </a>
-      <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
+      <!--<a href="#/app/help" class="item item-icon-left o_purpleG300to500">
       <i class="icon ion-ios-paper-outline"></i>
         {{'FAQ' | translate }}
       </a>
       <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-ios-help-outline"></i>
         {{'Help' | translate }}
-      </a>
+    </a>-->
   </ion-content>
 </ion-view>
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 2ad9af5..2002fbb 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -8,10 +8,18 @@
         <button class="button button-icon button-clear ion-navicon o_text_purple500" menu-toggle="left">
         </button>
       </ion-nav-buttons>
+      <ion-nav-buttons side="right">
+        <a ng-href="#/app/main" menu-close class="button button-icon button-clear ion-home o_text_purple500">
+    </a>
+        <a ng-href="#/app/notifications" menu-close class="button button-icon button-clear ion-android-notifications-none o_text_purple500">
+      </a>
+        <a ng-href="#/app/newTravel" menu-close class="button button-icon button-clear ion-map o_text_purple500">
+    </a>
+      </ion-nav-buttons>
     </ion-nav-bar>
     <ion-nav-view name="menuContent"></ion-nav-view>
     <!-- menu footer -->
-    <div class="tabs tabs-icon-left" style="position:absolute;"
+    <!--<div class="tabs tabs-icon-left" style="position:absolute;"
     ng-controller="FooterMenuCtrl" ng-show="storageuser">
       <a class="tab-item" ng-href="#/app/notifications">
         <i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }}
@@ -22,7 +30,7 @@
       <a ng-href="#/app/newTravel" class="tab-item">
         <i class="icon ion-map"></i> {{'New_travel' | translate }}
       </a>
-    </div>
+  </div>-->
     <!-- /menu footer -->
   </ion-side-menu-content>
 
@@ -32,12 +40,14 @@
     </ion-header-bar>
     <ion-content>
       <ion-list>
+        <a class="item item-icon-left item-avatar o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}">
+        <img src="{{storageuser.avatar}}" />
+        <h2>{{storageuser.username}}</h2>
+        <p>{{storageuser.description}}</p>
+      </a>
         <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/main">
           <i class="icon ion-home"></i> {{'Main' | translate }}
         </a>
-        <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}">
-          <i class="icon ion-person"></i> {{storageuser.username}}
-        </a>
         <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/search">
           <i class="icon ion-search"></i> {{'Search' | translate }}
         </a>