arnaucube
arnaucube/commonroutesAppPublic Self-hosted repository
home, notifications, new travel buttons moved to top bar
arnaucode idoctnef@openmailbox.org
Tue, 27 Jun 2017 13:51:09 +0200
commit

94c9be1a82894cd51fe98d6559ef6c24fa0515db

parent

1da3b98715c481ae65056f1a005bb9d1b98745f9

3 files changed, 19 insertions(+), 9 deletions(-)

jump to
M www/js/app.js → www/js/app.js

@@ -6,9 +6,9 @@ // the 2nd parameter is an array of 'requires'

// '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',
M www/templates/main.html → www/templates/main.html

@@ -29,13 +29,13 @@ <a href="#/app/settings" class="item item-icon-left o_purpleG300to500">

<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>
M www/templates/menu.html → www/templates/menu.html

@@ -8,10 +8,18 @@ <ion-nav-buttons side="left">

<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>

<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,11 +40,13 @@ <h1 class="title">{{'Menu' | translate }}</h1>

</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 }}