From 907ec6e62db5c534a0be3f40d6b683a763cc2573 Mon Sep 17 00:00:00 2001 From: arnaucode Date: Fri, 27 Jan 2017 19:29:48 +0100 Subject: [PATCH] map src block fixed, and travel page updated --- www/css/style.css | 8 +++- www/js/app.js | 4 +- www/js/offerCar.js | 9 +++- www/js/travel.js | 6 +++ www/templates/offerCar.html | 2 +- www/templates/travel.html | 86 +++++++++++++++++-------------------- www/templates/travels.html | 2 +- 7 files changed, 65 insertions(+), 52 deletions(-) diff --git a/www/css/style.css b/www/css/style.css index 8d164d9..4c814f3 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -37,11 +37,17 @@ border-radius: 150px; -webkit-border-radius: 150px; -moz-border-radius: 150px; - /*background: url(http://link-to-your/image.jpg) no-repeat;*/ } .o_userImgCircular p{ color: #ffffff!important; } +.o_userImgCircularMini { + background: #ffffff; + width: 35px; + border-radius: 150px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; +} /* SISTEMA DE COLORS diff --git a/www/js/app.js b/www/js/app.js index 2b72f12..01d28e7 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="https://collectivecar.paas.primustech.io/api/"; -//var urlapi="http://147.83.7.158:3000/api/"; +var urlapi="http://147.83.7.158:3000/api/"; angular.module('starter', [ diff --git a/www/js/offerCar.js b/www/js/offerCar.js index fd44b3f..bc5ad57 100644 --- a/www/js/offerCar.js +++ b/www/js/offerCar.js @@ -18,7 +18,12 @@ angular.module('app.offerCar', ['pascalprecht.translate', 'ui-leaflet']) zoom: 1 }; $scope.markers=new Array(); - + $scope.tiles= { + url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + options: { + attribution: 'OpenStreetMap contributors' + } + }; $scope.createTravel =function(){ $scope.newtravel.type="offering"; $http({ @@ -44,6 +49,7 @@ angular.module('app.offerCar', ['pascalprecht.translate', 'ui-leaflet']) .then(function(data) { $scope.newtravel.from.lat=data.data[0].lat; $scope.newtravel.from.long=data.data[0].lon; + $scope.newtravel.from.name=data.data[0].display_name; $scope.markers.push({ lat: Number(data.data[0].lat), lng: Number(data.data[0].lon), @@ -53,6 +59,7 @@ angular.module('app.offerCar', ['pascalprecht.translate', 'ui-leaflet']) .then(function(data) { $scope.newtravel.to.lat=data.data[0].lat; $scope.newtravel.to.long=data.data[0].lon; + $scope.newtravel.to.name=data.data[0].display_name; $scope.markers.push({ lat: Number(data.data[0].lat), lng: Number(data.data[0].lon), diff --git a/www/js/travel.js b/www/js/travel.js index 9b0bab8..eaf34e8 100644 --- a/www/js/travel.js +++ b/www/js/travel.js @@ -9,6 +9,12 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet']) zoom: 1 }; $scope.markers=[]; + $scope.tiles= { + url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + options: { + attribution: 'OpenStreetMap contributors' + } + }; $scope.travel={}; $scope.doRefresh = function() { diff --git a/www/templates/offerCar.html b/www/templates/offerCar.html index 922723c..8792d7f 100644 --- a/www/templates/offerCar.html +++ b/www/templates/offerCar.html @@ -19,7 +19,7 @@ Get positions + tiles="tiles" id="map-simple-map">
diff --git a/www/templates/travel.html b/www/templates/travel.html index 7a4277b..7d79935 100644 --- a/www/templates/travel.html +++ b/www/templates/travel.html @@ -1,11 +1,10 @@ -
- +

- + {{travel.user.username}}

@@ -13,64 +12,59 @@

-

{{travel.title}}

+

+ {{travel.title}}

{{travel.date | date:"dd/MM HH:mm a"}}
+ + tiles="tiles" id="map-simple-map"> +
+

+

+ {{'Ask_to_join' | translate}} + {{'Offer_car' | translate}} + {{'Offer_car' | translate}} +
+ +
+ {{'Unjoin' | translate}} + {{'Unoffer_car' | translate}} + {{'Unoffer_car' | translate}} +
+

+
+
+ {{travel.from.name}} --> {{travel.to.name}} +
+
+ {{travel.description}} +
+
+ package +
+
+ @{{user.telegram}} +
+
+ {{travel.user.phone}} +
+
+ {{travel.seats}} seats +
+
-

{{travel.description}}

-
-
-

{{travel.from.name}} --> {{travel.to.name}}

-
-
-
-

- {{travel.user.phone}} -

-

- - @{{travel.user.telegram}} - -

-

{{'Collectivized' | translate}}

-

-

-
{{'Can_carry_package' | translate}}
-
{{'Need_to_carry_package' | translate}}
-
-

- -

-

{{'n_Seats' | translate}}: {{travel.seats}}
-
{{'n_People' | translate}}: {{travel.seats}}
-


-
-

-

- {{'Ask_to_join' | translate}} - {{'Offer_car' | translate}} - {{'Offer_car' | translate}} -
-
- {{'Unjoin' | translate}} - {{'Unoffer_car' | translate}} - {{'Unoffer_car' | translate}} -
-

-
{{'Joined_users' | translate}}:
diff --git a/www/templates/travels.html b/www/templates/travels.html index 76bfd5a..dacf51e 100644 --- a/www/templates/travels.html +++ b/www/templates/travels.html @@ -32,7 +32,7 @@

-

{{travel.from}} --> {{travel.to}}

+

{{travel.from.name}} --> {{travel.to.name}}