|
|
|
|
@ -61,15 +61,11 @@
|
|
|
|
|
|
|
|
|
|
<div class="" style="text-align:center">
|
|
|
|
|
<img src="{{companyUrl}}" class="CompanyImg logoImg">
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
|
|
|
|
|
</div>
|
|
|
|
|
<div class="menuFooter">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
|
|
|
|
|
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
|
|
|
|
|
=======
|
|
|
|
|
<div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div>
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
>>>>>>> 25ada829dfd1fa6b65bb611ae62c30323e18f3f7
|
|
|
|
|
</div>
|
|
|
|
|
</ion-content>
|
|
|
|
|
</ion-menu>
|
|
|
|
|
@ -117,7 +113,6 @@
|
|
|
|
|
</ion-label>
|
|
|
|
|
</ion-item>
|
|
|
|
|
<ion-item (click)="openChangePassword()">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<ion-thumbnail slot="start" class="menu-thumb">
|
|
|
|
|
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
|
|
|
|
|
</ion-thumbnail>
|
|
|
|
|
@ -157,35 +152,14 @@
|
|
|
|
|
|
|
|
|
|
<div class="" style="text-align:center">
|
|
|
|
|
<img src="{{companyUrl}}" class="CompanyImg logoImg">
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
|
|
|
|
|
</div>
|
|
|
|
|
<div class="menuFooter">
|
|
|
|
|
<!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
|
|
|
|
|
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
|
|
|
|
|
<div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div>
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</ion-content>
|
|
|
|
|
</ion-menu>
|
|
|
|
|
=======
|
|
|
|
|
<ion-thumbnail slot="start" class="menu-thumb">
|
|
|
|
|
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
|
|
|
|
|
</ion-thumbnail>
|
|
|
|
|
<ion-label class="changepassword" >
|
|
|
|
|
{{ts.trPK('login','changepassword')}}
|
|
|
|
|
<ion-badge class="end-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
|
|
|
|
|
</ion-label>
|
|
|
|
|
</ion-item>
|
|
|
|
|
</ion-list>
|
|
|
|
|
>>>>>>> 25ada829dfd1fa6b65bb611ae62c30323e18f3f7
|
|
|
|
|
|
|
|
|
|
<div class="" style="text-align:center">
|
|
|
|
|
<img src="{{companyUrl}}" class="CompanyImg logoImg">
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="menuFooter">
|
|
|
|
|
<p class="companyTxt">{{companyDesc}}</p>
|
|
|
|
|
</div>
|
|
|
|
|
</ion-content>
|
|
|
|
|
</ion-menu>
|
|
|
|
|
<ion-router-outlet main></ion-router-outlet>
|
|
|
|
|
</ion-split-pane>
|
|
|
|
|
|
|
|
|
|
|