arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 03:26:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
arnaucode
2017-01-30 08:52:23 +01:00
parent 884a1959ef
commit 2a02e38df2
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/templates/editUser.html
View File

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

4
www/templates/newTravel.html
View File

@@ -4,11 +4,11 @@
<i class="icon ion-android-car"></i> <i class="icon ion-android-car"></i>
Offer Car Offer Car
</a> </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> <i class="icon ion-help"></i>
Ask for Car Ask for Car
</a> </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> <i class="icon ion-ios-box"></i>
Ask for Package Ask for Package
</a> </a>

6
www/templates/offerCar.html
View File

@@ -16,9 +16,11 @@
</md-input-container> </md-input-container>
</div> </div>
</div><!-- end of padding --> </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> tiles="tiles" id="map-simple-map"></leaflet>
<div class="padding" ng-show="markers[0]"> <div class="padding" ng-show="markers[0]">

45
www/templates/travel.html
View File

@@ -23,23 +23,6 @@
<leaflet width="100%" height="40%" markers="markers" center="center" <leaflet width="100%" height="40%" markers="markers" center="center"
tiles="tiles" id="map-simple-map"></leaflet> 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"> <div class="item item-icon-left">
<i class="icon ion-ios-location-outline"></i>From: {{travel.from.name}} <i class="icon ion-ios-location-outline"></i>From: {{travel.from.name}}
</div> </div>
@@ -60,7 +43,29 @@
<div class="item item-icon-left" ng-show="travel.user.phone"> <div class="item item-icon-left" ng-show="travel.user.phone">
<i class="icon ion-ios-telephone"></i> {{travel.user.phone}} <i class="icon ion-ios-telephone"></i> {{travel.user.phone}}
</div> </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="item item-body" ng-show="travel.collectivized">
<div class='row'> <div class='row'>
<div class='col o-text-right'> <div class='col o-text-right'>
@@ -78,9 +83,9 @@
<i class="icon ion-edit"></i> <i class="icon ion-edit"></i>
</button>--> </button>-->
<p>{{travel.joins.length}}/{{travel.seats}} seats</p> <p>{{travel.joins.length}}/{{travel.seats}} seats</p>
<a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}"> <a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}">
<img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img> <img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img>
</a> </a>
</div> </div>
<div ng-show="travel.joinPetitions.length>0"> <div ng-show="travel.joinPetitions.length>0">
<p>Pendent petitions</p> <p>Pendent petitions</p>