icon and splashscreen updated, askForCar and askForPackage implemented, visualization of type of travel in the travels view

www/templates/askForCar.html

@@ -0,0 +1,58 @@
+<ion-view view-title="{{'Ask_For_Car' | translate}}">
+  <ion-content>
+      <div class="padding">
+          <label class="item item-input">
+            <span class="input-label">{{'Title' | translate}}</span>
+            <input type="text" ng-model="newtravel.title">
+          </label>
+          <div layout="row">
+              <label class="item item-input">
+                <span class="input-label">{{'From' | translate}}</span>
+                <input type="text" ng-model="newtravel.from.name">
+              </label>
+              <label class="item item-input">
+                <span class="input-label">{{'To' | translate}}</span>
+                <input type="text" ng-model="newtravel.to.name">
+              </label>
+          </div>
+      </div><!-- end of padding -->
+      <a ng-click="getGeo()" ng-show="newtravel.from.name && newtravel.to.name"
+      class="button o_purple300">{{'Get_positions' | translate}}</a>
+
+      <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]">
+          <label class="item item-input">
+            <span class="input-label">{{'n_People' | translate}}</span>
+            <input ng-model="newtravel.seats" type="number">
+          </label>
+
+          <label class="item-input">
+              <span class="input-label">{{'Date' | translate}}</span>
+              <input ng-model="newtravel.date" type="date" placeholder="">
+          </label>
+          <label class="item-input">
+              <span class="input-label">{{'Hour' | translate}}</span>
+              <input ng-model="newtravel.date" type="time" placeholder="">
+          </label>
+          <ion-toggle ng-model="newtravel.package" toggle-class="toggle-calm">
+              <i class="icon ion-ios-box"></i>
+              {{'Want_to_carry_package' | translate}}
+          </ion-toggle>
+          <!--<ion-toggle ng-model="newtravel.collectivized" toggle-class="toggle-calm">
+              {{'Collectivized_car' | translate}}
+          </ion-toggle>-->
+          <label class="item item-input">
+            <span class="input-label">{{'Description' | translate}}</span>
+            <input type="text" ng-model="newtravel.description">
+          </label>
+          <p class="padding">
+            <a ng-click="createTravel()" class="button o_purple400 o_floatRight">
+               {{'Post_asking_car' | translate}}
+           </a>
+          </p>
+      </div><!-- end of padding -->
+  </ion-content>
+</ion-view>

www/templates/askForPackage.html

@@ -0,0 +1,58 @@
+<ion-view view-title="{{'Ask_For_Package' | translate}}">
+  <ion-content>
+      <div class="padding">
+          <label class="item item-input">
+            <span class="input-label">{{'Title' | translate}}</span>
+            <input type="text" ng-model="newtravel.title">
+          </label>
+          <div layout="row">
+              <label class="item item-input">
+                <span class="input-label">{{'From' | translate}}</span>
+                <input type="text" ng-model="newtravel.from.name">
+              </label>
+              <label class="item item-input">
+                <span class="input-label">{{'To' | translate}}</span>
+                <input type="text" ng-model="newtravel.to.name">
+              </label>
+          </div>
+      </div><!-- end of padding -->
+      <a ng-click="getGeo()" ng-show="newtravel.from.name && newtravel.to.name"
+      class="button o_purple300">{{'Get_positions' | translate}}</a>
+
+      <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]">
+          <!--<label class="item item-input">
+            <span class="input-label">{{'n_Seats' | translate}}</span>
+            <input ng-model="newtravel.seats" type="number">
+        </label>-->
+
+          <label class="item-input">
+              <span class="input-label">{{'Date' | translate}}</span>
+              <input ng-model="newtravel.date" type="date" placeholder="">
+          </label>
+          <label class="item-input">
+              <span class="input-label">{{'Hour' | translate}}</span>
+              <input ng-model="newtravel.date" type="time" placeholder="">
+          </label>
+          <!--<ion-toggle ng-model="newtravel.package" toggle-class="toggle-calm">
+              <i class="icon ion-ios-box"></i>
+              {{'Can_carry_package' | translate}}
+          </ion-toggle>
+          <ion-toggle ng-model="newtravel.collectivized" toggle-class="toggle-calm">
+              {{'Collectivized_car' | translate}}
+          </ion-toggle>-->
+          <label class="item item-input">
+            <span class="input-label">{{'Description' | translate}}</span>
+            <input type="text" ng-model="newtravel.description">
+          </label>
+          <p class="padding">
+            <a ng-click="createTravel()" class="button o_purple400 o_floatRight">
+               {{'Ask_for_package' | translate}}
+           </a>
+          </p>
+      </div><!-- end of padding -->
+  </ion-content>
+</ion-view>

www/templates/editUser.html

@@ -1,5 +1,5 @@
 <ion-view view-title="{{'Edit_user' | translate}} {{user.username}}">
-  <ion-content class="has-footer">
+  <ion-content>
     <div class="o_userProfileBackground">
         <img ng-src="{{user.avatar}}" class="o_userImgCircular"
         ng-click="selectAvatar()"/>
@@ -24,6 +24,10 @@
         </p>
     </div>
     <div class="item">
+        <p>
+        <input ng-model="user.faircoinString" class="o_transparentInputBlack"
+        placeholder="{{'FaircoinWallet' | translate}}">
+    </p>
         <img src="{{user.faircoin}}" style="width: 100%;"
          ng-click="selectFaircoinPublicKey()" />
     </div>

www/templates/newTravel.html

@@ -4,13 +4,13 @@
         <i class="icon ion-android-car"></i>
         {{'Offer_Car' | translate}}
       </a>
-      <a href="" class="item item-icon-left o_purple400">
+      <a href="#/app/askForCar" class="item item-icon-left o_purple400">
         <i class="icon ion-help"></i>
-        {{'Ask_for_Car' | translate}} (not yet)
+        {{'Ask_for_Car' | translate}}
       </a>
-      <a href="" class="item item-icon-left o_purple300">
+      <a href="#/app/askForPackage" class="item item-icon-left o_purple300">
       <i class="icon ion-ios-box"></i>
-        {{'Ask_for_Package' | translate}} (not yet)
+        {{'Ask_for_Package' | translate}}
     </a>
   </ion-content>
 </ion-view>

www/templates/offerCar.html

@@ -1,5 +1,5 @@
 <ion-view view-title="{{'Offer_Car' | translate}}">
-  <ion-content class="has-footer">
+  <ion-content>
       <div class="padding">
           <label class="item item-input">
             <span class="input-label">{{'Title' | translate}}</span>

www/templates/travel.html

@@ -20,7 +20,10 @@
         </p>
       </div>
       <h2>
-        <i class="icon ion-android-car"></i> {{travel.title}}</h2>
+        <i ng-show="travel.type=='offering'" class="icon ion-android-car"></i>
+        <i ng-show="travel.type=='asking'" class="icon ion-help"></i>
+        <i ng-show="travel.type=='package'" class="icon ion-ios-box"></i>
+        {{travel.title}}</h2>
       <div class="">{{travel.date | date:"dd/MM HH:mm a"}}</div>
     </div>
 

www/templates/travels.html

@@ -23,7 +23,9 @@
         <div class="item-note text-right">
             {{travel.user.username}}
         </div>
-          <i class="icon ion-android-car o_text_grey700"></i>
+          <i ng-show="travel.type=='offering'" class="icon ion-android-car o_text_grey700"></i>
+          <i ng-show="travel.type=='asking'" class="icon ion-help o_text_grey700"></i>
+          <i ng-show="travel.type=='package'" class="icon ion-ios-box o_text_grey700"></i>
           <h2 class="o_text_grey800">{{travel.title}}</h2>
           <div class="item-note text-right">
               <div class="o_text_purple300">{{travel.date | date:"dd/MM"}}</div>

www/templates/user.html

@@ -44,6 +44,9 @@
       </div>
     </div>
     <div class="item">
+        <p>
+            {{user.faircoinString}}
+        </p>
       <img src="{{user.faircoin}}" style="width: 100%;" />
     </div>
     <!--<div class="item item-body">