Browse Source

home, notifications, new travel buttons moved to top bar

master
arnaucode 7 years ago
parent
commit
94c9be1a82
3 changed files with 19 additions and 9 deletions
  1. +2
    -2
      www/js/app.js
  2. +2
    -2
      www/templates/main.html
  3. +15
    -5
      www/templates/menu.html

+ 2
- 2
www/js/app.js

@ -6,9 +6,9 @@
// 'starter.controllers' is found in controllers.js // '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://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', [ angular.module('starter', [
'ionic', 'ionic',

+ 2
- 2
www/templates/main.html

@ -29,13 +29,13 @@
<i class="icon ion-settings"></i> <i class="icon ion-settings"></i>
{{'Settings' | translate }} {{'Settings' | translate }}
</a> </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> <i class="icon ion-ios-paper-outline"></i>
{{'FAQ' | translate }} {{'FAQ' | translate }}
</a> </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-help-outline"></i> <i class="icon ion-ios-help-outline"></i>
{{'Help' | translate }} {{'Help' | translate }}
</a>
</a>-->
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 15
- 5
www/templates/menu.html

@ -8,10 +8,18 @@
<button class="button button-icon button-clear ion-navicon o_text_purple500" menu-toggle="left"> <button class="button button-icon button-clear ion-navicon o_text_purple500" menu-toggle="left">
</button> </button>
</ion-nav-buttons> </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-bar>
<ion-nav-view name="menuContent"></ion-nav-view> <ion-nav-view name="menuContent"></ion-nav-view>
<!-- menu footer --> <!-- 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"> ng-controller="FooterMenuCtrl" ng-show="storageuser">
<a class="tab-item" ng-href="#/app/notifications"> <a class="tab-item" ng-href="#/app/notifications">
<i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }} <i class="icon ion-android-notifications-none"></i> {{'Notifications' | translate }}
@ -22,7 +30,7 @@
<a ng-href="#/app/newTravel" class="tab-item"> <a ng-href="#/app/newTravel" class="tab-item">
<i class="icon ion-map"></i> {{'New_travel' | translate }} <i class="icon ion-map"></i> {{'New_travel' | translate }}
</a> </a>
</div>
</div>-->
<!-- /menu footer --> <!-- /menu footer -->
</ion-side-menu-content> </ion-side-menu-content>
@ -32,12 +40,14 @@
</ion-header-bar> </ion-header-bar>
<ion-content> <ion-content>
<ion-list> <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"> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/main">
<i class="icon ion-home"></i> {{'Main' | translate }} <i class="icon ion-home"></i> {{'Main' | translate }}
</a> </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"> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/search">
<i class="icon ion-search"></i> {{'Search' | translate }} <i class="icon ion-search"></i> {{'Search' | translate }}
</a> </a>

Loading…
Cancel
Save