Updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174419 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/Angular/ProteusECM/trunk/src/app/ecm-product-details/ecm-product-details.component.html

@@ -7,7 +7,7 @@
    </ecm-template>
 </div>
 
-<div class="row" *ngIf="itemDetail" #reviewsAndRating>
+<div class="row" *ngIf="itemDetail.itemRatings.NO_OF_REVIEWS != 0" #reviewsAndRating>
    <ecm-product-review [itemDetail] = "itemDetail"></ecm-product-review>
 </div>
 

ecm/Angular/ProteusECM/trunk/src/app/ecm-search/ecm-search-result/ecm-search-result.component.css

@@ -31,8 +31,7 @@ h4{
 	display: block;
 }
 .end {
-	padding-top: 15px;
-	padding-bottom: 50px;
+	padding-bottom: 30px;
 }
 .row.row-category {
 	max-width: 72rem;
@@ -47,10 +46,11 @@ h4{
 	margin: 5px;
 	text-align: center;
 	border-radius: 100%;
-	color: mediumvioletred;
 	cursor: pointer;
 	position: relative;
 	display: inline-block;
+	color: black;
+    background-color: #efecec;
 }
 .ecm-page:HOVER, .active {
 	background-color: mediumvioletred;
@@ -58,8 +58,7 @@ h4{
 }
 
 .ecm-result-header{
-	padding-left: 15px;
-	padding-right: 15px;
+	padding: 15px;
 }
 
 .arrow_logo{
@@ -142,9 +141,42 @@ option{
 }
 
 .next-button, .prev-button {
+    background: white;
     cursor: pointer;
+    box-shadow: 0 0px 5px 1px rgba(0,0,0,.1);
+    height: 25px;
+    width: 25px;
+    min-width: 25px;
+    border-radius: 100%;
+    font-size: 15px;
+    vertical-align: bottom;
+    margin: 5px;
+    padding: 0;
+    line-height: 15px;
 }
 
+.prev-button:ACTIVE {	
+	color: white;
+    background-color: black;
+    opacity: 1;
+}
+
+.next-button:ACTIVE {
+	color: white;
+    background-color: black;
+}
+
+.prev-button:BEFORE {
+	content: "\2039";
+    font-size: 30px;
+    line-height: 15px;
+}
+
+.next-button:BEFORE {
+	content: "\203A";
+    font-size: 30px;
+    line-height: 15px;
+}
 
 /* No Result */
 

ecm/Angular/ProteusECM/trunk/src/app/ecm-search/ecm-search-result/ecm-search-result.component.html

@@ -51,18 +51,15 @@
 				<div class="ecm-pagination-section">
 					<span class="ecm-pages-info">Page {{activePage}} of
 						{{pageCount}}</span> 
-					<span class="prev-button"
-						[ngClass]="{disabled:activePage === 1}" (click)="loadPrevious()">
-						<img class="arrow_logo" src="v_left_arrow_38_38.png">
-					</span> 
+					<button md-button [ngClass]="{disabled:activePage === 1}" (click)="loadPrevious()" class="prev-button"> </button>
+					
 					<span #page>
 						<span *ngFor="let a of createPages(); let i = index" [ngClass]="{active:(i+1) === activePage}" class="ecm-page" (click)="goToPage(i)"> 
 							<span>{{i+1}}</span>
 						</span>
 					</span> 
-					<span class="next-button" [ngClass]="{disabled:activePage === pageCount}" (click)="loadNext()">
-						<img class="arrow_logo" src="v_right_arrow_38_38.png">
-					</span>
+	
+					<button md-button [ngClass]="{disabled:activePage === pageCount}" (click)="loadNext()" class="next-button"> </button>
 				</div>
 			</span>
 		</div>

ecm/Angular/ProteusECM/trunk/src/app/ecm-view/ecm-cart/ecm-cart.component.css

@@ -55,7 +55,7 @@
 	border: 2px solid ghostwhite;
     border-left: none;
     border-right: none;
-    padding: 30px;
+    padding: 30px 30px 0 30px;
 }
 
 .ViewAll{
@@ -202,18 +202,21 @@
 	color: #787878;
     font-size: 14px;
     font-weight: 700;
+    line-height: 36px;
+    padding-right: 20px;
 }
 .selected{
 	position: relative;
     left: 5px;
     height: 36px;
     font-size: 15px;
-    margin-left: 8px;
     background-color: mediumvioletred;
     border-radius: 100%;
     min-width: 36px;
     line-height: 36px;
     color: white;
+    padding: 0;
+    cursor: default;
 }
 .color-change{
 	position: relative;
@@ -223,6 +226,7 @@
     cursor: pointer;
     font-weight: 600;
     padding-left: 8px;
+    line-height: 36px;
 }
 .wishList-items{
 	font-size: 12px;
@@ -436,3 +440,25 @@
     margin-left: 17px;
 }
 
+/* attribute colors */
+.BLACK, .BLK_WH{
+  background-color: black;
+}
+.BLUE, .BLU_WH{
+  background-color: blue;
+}
+.BROWN{
+  background-color: brown;
+}
+.PEACH{
+  background-color: peachpuff;
+}
+.RED, .RED_WH{
+  background-color: red;
+}
+.WHITE{
+  background-color: white;
+}
+.YELLOW{
+  background-color: yellow;
+}

ecm/Angular/ProteusECM/trunk/src/app/ecm-view/ecm-cart/ecm-cart.component.html

@@ -58,11 +58,19 @@
 						<span class="item-seller">Sold by</span> 
 						<span class="item-sellerInfo">Handmade Handicarfts</span>
 					</div>
-					<div class="change-color">
-						<span class="size-of-item">Size Selected :</span>
-						<button md-button class="back btn selected">L</button>
+					<div *ngIf="item.phyAttribId3" class="change-color">
+						<span class="size-of-item">Color Selected</span>
+						<button [ngClass]="item.phyAttribId3" md-button class="back btn selected"></button>
 						<span class="color-change">Change</span>
 					</div>
+					
+					<div *ngIf="item.phyAttribId1" class="change-color">
+						<span class="size-of-item">Size Selected</span>
+						<button md-button class="back btn selected">{{item.phyAttribId1}}</button>
+						<span class="color-change">Change</span>
+					</div>
+					
+					
 				</div>
 
 				<div class="media-object-section" style="width: 228px;">