diff --git a/www/js/app.js b/www/js/app.js index 5729278..21aba3e 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 = "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', diff --git a/www/js/travels.js b/www/js/travels.js index d624ab9..e4e42ea 100644 --- a/www/js/travels.js +++ b/www/js/travels.js @@ -18,6 +18,7 @@ angular.module('app.travels', ['pascalprecht.translate']) if (data.data.length < 1) { console.log("setting loadMorePagination to false"); $scope.loadMorePagination = false; + $scope.$broadcast('scroll.infiniteScrollComplete'); } }, function(data) { diff --git a/www/templates/askForCar.html b/www/templates/askForCar.html index d38a10b..ad7b080 100644 --- a/www/templates/askForCar.html +++ b/www/templates/askForCar.html @@ -1,4 +1,4 @@ - + diff --git a/www/templates/askForPackage.html b/www/templates/askForPackage.html index 8c54488..66b1dea 100644 --- a/www/templates/askForPackage.html +++ b/www/templates/askForPackage.html @@ -1,4 +1,4 @@ - + diff --git a/www/templates/help.html b/www/templates/help.html index 325669d..167dc09 100644 --- a/www/templates/help.html +++ b/www/templates/help.html @@ -53,7 +53,7 @@

- To create a new publication, just need to click the 'New Travel' button on the right of footer menu, + To create a new publication, just need to click the 'New Travel' button on the right of top menu, and select wich type of publication is.

diff --git a/www/templates/settings.html b/www/templates/settings.html index dcf8ac2..f427362 100644 --- a/www/templates/settings.html +++ b/www/templates/settings.html @@ -10,7 +10,7 @@

- {{'version' | translate}}: CarsInCommon-v012 + {{'version' | translate}}: CarsInCommon-v0.1

diff --git a/www/templates/travel.html b/www/templates/travel.html index c4de7ed..747b78b 100644 --- a/www/templates/travel.html +++ b/www/templates/travel.html @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ {{travel.user.username}} -

+

@@ -90,7 +90,7 @@ -

{{travel.joins.length}}/{{travel.seats}} {{'seats' | translate}}

+

{{travel.joins.length}}/{{travel.seats}} {{'seats' | translate}}

diff --git a/www/templates/travelListTemplate.html b/www/templates/travelListTemplate.html new file mode 100644 index 0000000..b72ca60 --- /dev/null +++ b/www/templates/travelListTemplate.html @@ -0,0 +1,17 @@ +
+ {{travel.user.username}} +
+ + + +

{{travel.title}}

+
+
{{travel.date | date:"dd/MM"}}
+
{{travel.date | date:"HH:mm"}}h
+
+

+ {{travel.from.name}} +

+

+ {{travel.to.name}} +

diff --git a/www/templates/travels.html b/www/templates/travels.html index f3779a6..ca3b9f5 100644 --- a/www/templates/travels.html +++ b/www/templates/travels.html @@ -1,5 +1,5 @@ - + @@ -20,23 +20,7 @@ -
- {{travel.user.username}} -
- - - -

{{travel.title}}

-
-
{{travel.date | date:"dd/MM"}}
-
{{travel.date | date:"HH:mm"}}h
-
-

- {{travel.from.name}} -

-

- {{travel.to.name}} -

+