Merge branch 'alen' into 'master'

src/app/app.html

 <ion-menu [content]="content">
-  <ion-content class="theme_bgcolor">
+  <ion-content class="theme_bgcolor" [ngClass]="lang=='ar' ? 'ar' : ''">
     <div class="cab_sidemenu_wrapper">
 
       <select [(ngModel)]="lang" (change)="changeLang(lang)">

src/app/app.scss

@@ -194,3 +194,143 @@ ion-popover{background: rgba(0,0,0,0.6) !important;}
 .toggle-md.toggle-checked .toggle-inner{background-color: #4CAF50 !important;}
 .toggle-md.toggle-checked .toggle-icon{background-color: #dedede!important}
 .toggle-md .toggle-inner{background-color: #dedede;}
+
+
+/* ARABIC-CSS */
+
+.ar {
+    .cab_login_wrapper h4 {
+        text-align: right !important;
+    }
+    .cab_login_wrapper hr {
+        border: 2px solid #f7941e;
+        height: 0px;
+        border-radius: 20px;
+        width: 35px;
+        margin-right: 0px;
+        margin-left: auto;
+    }
+    .cab_phone_input {
+        text-align: right;
+        padding-right: 10px;
+        padding-left: 20px;
+    }
+    .cab_user {
+        background-position: left;
+    }
+    .cab_mail {
+        background-position: left;
+    }
+    .cab_pass {
+        background-position: left;
+    }
+    .cab_confirmpass {
+        background-position: left;
+    }
+    .cab_call {
+        background-position: left;
+    }
+    .floatLeft {
+        float: right !important;
+    }
+    .floatRight {
+        float: left !important;
+    }
+    .item-inner ion-label {
+        text-align: right !important;
+    }
+    .nav_header_title {
+        text-align: right;
+    }
+    .cab_profile_picture {
+        margin-right: 0px;
+        margin-left: auto;
+    }
+    .cab_profile_banner p {
+        text-align: right;
+    }
+    .cab_profile_banner h6 {
+        text-align: right;
+    }
+    .cab_sidemenu_list ul li {
+        text-align: right;
+    }
+    .home_content_circle {
+        float: right !important;
+    }
+    .home_content_detail {
+        float: right !important;
+    }
+    .home_content_right {
+        float: left !important;
+        padding-right: 15px !important;
+        padding-left: 0px !important;
+        border-left: none !important;
+        border-right: 1px solid #acacac;
+    }
+    .home_content_detail {
+        padding-right: 20px !important;
+        padding-left: 0px !important;
+    }
+    .home_content_tab ul li .home_content_detail h5 {
+        text-align: right;
+    }
+    .home_content_tab ul li .home_content_detail p {
+        padding-left: 0px !important;
+        padding-right: 20px;
+        text-align: right;
+        background-position: right !important;
+    }
+    .sign_up_wrapper h4 {
+        text-align: right;
+    }
+    .sign_up_wrapper hr {
+        margin-right: 0px !important;
+        margin-left: auto !important;
+    }
+    .sign_up_wrapper p {
+        text-align: right;
+    }
+    .upload_doc_circle {
+        float: right !important;
+    }
+    .upload_doc_detail {
+        float: left !important;
+    }
+    .upload_doc_list .list .item .item-inner {
+        position: relative !important;
+    }
+    .upload_doc_list .list .radio {
+        margin-right: 0px;
+        position: absolute;
+        left: 0px;
+        right: 0px;
+    }
+    .upload_doc_list .list .item {
+        padding-bottom: 15px;
+    }
+    .myprofile_wrapper h4 {
+        text-align: right;
+    }
+    .myprofile_wrapper hr {
+        margin-right: 0px !important;
+        margin-left: auto !important;
+    }
+    .profile_circle_pic {
+        margin-right: 0px;
+        margin-left: auto;
+    }
+    .myprofile_wrapper .profile_circle_pic .edit {
+        left: -45px !important;
+    }
+    .text-input {
+        text-align: right;
+    }
+    .datetime-text {
+        text-align: right;
+    }
+    .select-text {
+        text-align: right;
+    }
+    select{text-align-last: right;}
+}
\ No newline at end of file

src/pages/changepass/changepass.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft" menuToggle>
         <ion-icon name="menu"></ion-icon>
     </button>
@@ -7,7 +7,7 @@
     </div>
     <div class="clear"></div>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
     <div class="login_wrapper">
         <ion-card>
             <ion-card-content>

src/pages/docupdate/docupdate.html

 
-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft">
         <ion-icon name="ios-arrow-back" (click)="back()"></ion-icon>
     </button>
@@ -8,7 +8,7 @@
     </div>
     <div class="clear"></div>
 </ion-header>
-  <ion-content padding>
+  <ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
       <div class="sign_up_wrapper">
           <h4>{{title}}</h4>
           <hr>

src/pages/forgot/forgot.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button class="nav_btn theme_color" (click)="back()">
     <ion-icon name="ios-arrow-back-outline"></ion-icon>
   </button>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
     <h4>{{'forgot.Forgot Password'|translate}}</h4>
     <hr>

src/pages/home/home.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft" menuToggle>
          <ion-icon name="menu"></ion-icon>
     </button>
@@ -18,7 +18,7 @@
     	</li>
     </div>
 </ion-header>
-<ion-content padding class="home_background">
+<ion-content padding class="home_background" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="home_content_tab"  [hidden]="tab != 'active'">
 		<ul>
 			<li *ngFor="let up of upcoming" (click)="rideDetails(up)">

src/pages/landing/landing.html

-<ion-content class="themelogin_background">
+<ion-content class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_landing_wrapper">
     <div class="cab_logo">
       <img src="assets/img/logo.png">

src/pages/landing/landing.ts

@@ -25,14 +25,13 @@ export class LandingPage {
 
   langTrans() {
     this.storage.get('lang').then(lang => {
-      // if (lang != null) {
-      //   this.translate.use(lang)
-      //   this.lang = lang;
-      // }
-      // else {
-      //   this.translate.use('en')
-      // }
-      this.lang = 'ar'
+      if (lang != null) {
+        this.translate.use(lang)
+        this.lang = lang;
+      }
+      else {
+        this.translate.use('en')
+      }
     })
   }
 

src/pages/myprofile/myprofile.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft" menuToggle>
         <ion-icon name="menu"></ion-icon>
     </button>
@@ -7,7 +7,7 @@
     </div>
     <div class="clear"></div>
   </ion-header>
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="myprofile_wrapper">
       <h4>{{'profile.My Profile'|translate}}</h4>
       <hr>

src/pages/payment/payment.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button ion-button class="nav_btn theme_color floatLeft"(click)="dismiss()">
      <ion-icon name="ios-arrow-back"></ion-icon>
   </button>
   <div class="nav_header_title floatLeft">{{'payment.Payment Details'|translate}}</div>
   <div class="clear"></div>
 </ion-header>
-<ion-content padding class="cab_coupon_bg">
+<ion-content padding class="cab_coupon_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="cab_trip_detail_wrapper">
 			<h4 class="text_white">{{'payment.Pickup Point'|translate}}</h4>
 			<p class="floatLeft textLeft width50">{{book.from}}</p>
@@ -54,7 +54,7 @@
 	</div>
 	
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
 	<div class="theme_bgcolor p10 text_white">
 		<p class="floatLeft text_size_18">{{'payment.Total'|translate}}</p>
 		<p class="floatRight text_size_18">Rs.{{details?.amount}}</p>

src/pages/quickride/quickride.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft">
            <ion-icon name="ios-arrow-back" (click)="back()"></ion-icon>
     </button>
@@ -7,7 +7,7 @@
     </div>
     <div class="clear"></div>
 </ion-header>
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
 <div class="jr_profile_content1">
 
 	<div class="jr_search_bottom_bay jr_padding0" >

src/pages/reject/reject.html

-<ion-content class="hm_theme_trans_bg">
+<ion-content class="hm_theme_trans_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="hm_cancel_pop_div">
     <div class="hm_cancel_pop_main">
       <div class="hm_cancel_pop_upper">

src/pages/ridedetails/ridedetails.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button class="nav_btn theme_color floatLeft">
            <ion-icon name="ios-arrow-back" (click)="back()"></ion-icon>
     </button>
@@ -7,7 +7,7 @@
     </div>
     <div class="clear"></div>
 </ion-header>
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
 <div class="jr_profile_content1">
   <div class="jr_from_to">
     <li>

src/pages/signin/signin.html

 
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
 	<div class="cab_logo">
       <img src="assets/img/cab_logo.png" style="width: 120px;">

src/pages/signup/signup.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button class="nav_btn theme_color" (click)="back()">
     <ion-icon name="ios-arrow-back-outline"></ion-icon>
   </button>
 </ion-header>
-<ion-content padding class="themelogin_background">
+<ion-content padding class="themelogin_background" [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="cab_login_wrapper">
     <h4>{{'signup.Sign Up'|translate}}</h4>
     <hr>

src/pages/uploaddoc/uploaddoc.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
   <button class="nav_btn theme_color floatLeft" menuToggle>
     <ion-icon name="menu"></ion-icon>
   </button>
@@ -7,7 +7,7 @@
   </div>
   <div class="clear"></div>
 </ion-header>
-<ion-content padding>
+<ion-content padding [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="sign_up_wrapper">
     <h4>{{'uploaddoc.Upload Docs'|translate}}</h4>
     <hr>

src/pages/userlocation/userlocation.html

-<ion-header class="theme_dark_bg">
+<ion-header class="theme_dark_bg" [ngClass]="lang=='ar' ? 'ar' : ''">
     <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
        <ion-icon name="ios-arrow-back"></ion-icon>
     </button>
     <div class="nav_header_title floatLeft">{{'userloc.User Location'|translate}}</div>
     <div class="clear"></div>
 </ion-header>
-<ion-content>
+<ion-content [ngClass]="lang=='ar' ? 'ar' : ''">
     <div #map id="map"></div>
     <div class="jr_bottom_distance_card" *ngIf="temp">
       <div class="jr_bottom_inside">
@@ -14,7 +14,7 @@
       </div>
     </div>
 </ion-content>
-<ion-footer>
+<ion-footer [ngClass]="lang=='ar' ? 'ar' : ''">
   <div class="jr_bottom_button_bay" *ngIf="!started">
       <button ion-button class="cab_footer_btn" (click)="startRide()">{{'userloc.Start Ride'|translate}}</button>
   </div>