Merge branch 'amal' into 'master'

src/app/productlist/productlist.page.html

@@ -17,8 +17,7 @@
 
             </div>
             <div class="viewset floatRight">
-                <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid">
-
+                <div class="grid_view grid_act floatRight" (click)="  ()" [class.line_view]="onGrid">
                 </div>
                 <div class="clear"></div>
             </div>
@@ -37,7 +36,7 @@
                 </div>
                 <h5>{{product.prodName}}</h5>
                 <p>A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p>
-            </li> 
+            </li>
         </ul>
     </div>
     <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]>