M www/templates/editUser.html → www/templates/editUser.html

@@ -15,7 +15,7 @@ </p>
 
         <p ng-show="storageuser._id==user._id">
             <md-button class="o_purple300" ng-click="update()">
-                Update profile
+                Save changes
             </md-button>
         </p>
     </div>

M www/templates/newTravel.html → www/templates/newTravel.html

@@ -4,11 +4,11 @@ <a ng-href="#/app/offerCar" class="item item-icon-left o_purple500">
         <i class="icon ion-android-car"></i>
         Offer Car
       </a>
-      <a href="#/app/dashboard" class="item item-icon-left o_purple400">
+      <a href="#/app/askCar" class="item item-icon-left o_purple400">
         <i class="icon ion-help"></i>
         Ask for Car
       </a>
-      <a href="#/app/marks/{{storageuser._id}}" class="item item-icon-left o_purple300">
+      <a href="#/app/askPackage" class="item item-icon-left o_purple300">
       <i class="icon ion-ios-box"></i>
         Ask for Package
     </a>

M www/templates/offerCar.html → www/templates/offerCar.html

@@ -16,9 +16,11 @@ <input ng-model="newtravel.to.name">
               </md-input-container>
           </div>
       </div><!-- end of padding -->
-      <md-button ng-click="getGeo()" class="o_purple300">Get positions</md-button>
+      <md-button ng-click="getGeo()" ng-show="newtravel.from.name && newtravel.to.name"
+      class="o_purple300">Get positions</md-button>
 
-      <leaflet width="100%" height="40%" markers="markers" center="center"
+      <leaflet ng-show="markers[0]"
+      width="100%" height="40%" markers="markers" center="center"
       tiles="tiles" id="map-simple-map"></leaflet>
 
       <div class="padding" ng-show="markers[0]">

M www/templates/travel.html → www/templates/travel.html

@@ -23,23 +23,6 @@
     <leaflet width="100%" height="40%" markers="markers" center="center"
     tiles="tiles" id="map-simple-map"></leaflet>
 
-    <div ng-show="storageuser._id!=travel.user._id" class="text-right">
-      <p class='text-right'>
-        <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)==-1">
-            <div ng-show="userHasJoined(travel.joins, storageuser._id)==-1">
-                <md-button ng-show="travel.type=='offering'" ng-click="joinTravel()" class="o_purple300">{{'Ask_to_join' | translate}}</md-button>
-                <md-button ng-show="travel.type=='asking'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
-                <md-button ng-show="travel.type=='package'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
-            </div>
-        </div>
-
-        <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)>-1">
-          <md-button ng-show="travel.type=='offering'" ng-click="unjoinTravel()" class="o_purple100">{{'Unjoin' | translate}}</md-button>
-          <md-button ng-show="travel.type=='asking'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
-          <md-button ng-show="travel.type=='package'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
-      </div>
-      </p>
-    </div>
     <div class="item item-icon-left">
         <i class="icon ion-ios-location-outline"></i>From: {{travel.from.name}}
     </div>
@@ -60,7 +43,29 @@ </a>
     <div class="item item-icon-left" ng-show="travel.user.phone">
         <i class="icon ion-ios-telephone"></i> {{travel.user.phone}}
     </div>
+    <div ng-show="storageuser._id!=travel.user._id" class="text-right">
+      <p class='text-right'>
+        <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)==-1">
+            <div ng-show="userHasJoined(travel.joins, storageuser._id)==-1">
+                <md-button ng-show="travel.type=='offering'" ng-click="joinTravel()" class="o_purple300">{{'Ask_to_join' | translate}}</md-button>
+                <md-button ng-show="travel.type=='asking'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
+                <md-button ng-show="travel.type=='package'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
+            </div>
+        </div>
 
+        <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)>-1">
+            <md-button ng-show="travel.type=='offering'" ng-click="unjoinTravel()" class="o_purple100">{{'Unjoin' | translate}}</md-button>
+            <md-button ng-show="travel.type=='asking'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
+            <md-button ng-show="travel.type=='package'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
+        </div>
+
+        <div ng-show="userHasJoined(travel.joins, storageuser._id)>-1">
+            <md-button ng-show="travel.type=='offering'" ng-click="" class="o_bRed">{{'Leave' | translate}}</md-button>
+            <md-button ng-show="travel.type=='asking'" ng-click="" class="o_purple100">{{'Leave' | translate}}</md-button>
+            <md-button ng-show="travel.type=='package'" ng-click="" class="o_purple100">{{'Leave' | translate}}</md-button>
+        </div>
+      </p>
+    </div>
     <div class="item item-body" ng-show="travel.collectivized">
       <div class='row'>
         <div class='col o-text-right'>
@@ -78,9 +83,9 @@ <!--<button class="o_floatRight button o_grey600" ng-show="travel.user._id==storageuser._id">
             <i class="icon ion-edit"></i>
         </button>-->
         <p>{{travel.joins.length}}/{{travel.seats}} seats</p>
-        <a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}">
-            <img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img>
-        </a>
+                <a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}">
+                    <img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img>
+                </a>
     </div>
     <div ng-show="travel.joinPetitions.length>0">
         <p>Pendent petitions</p>