Skip to content

B
business-java
Commit b08c7548 authored by prumde's avatar prumde
Browse files
Options

Updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174462 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 544a7557
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 34 deletions
ecm/Angular/ProteusECM/trunk/src/app/ecm-card/ecm-card.component.css
View file @ b08c7548
...@@ -8,7 +8,13 @@ ...@@ -8,7 +8,13 @@
width: auto; width: auto;
background-color: #fff; background-color: #fff;
border-radius: 3px; border-radius: 3px;
cursor: pointer;
} }
@media screen and (max-width: 640px){
.ecm-card {
box-shadow: none;
}
}
.ecm-card-img { .ecm-card-img {
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
...@@ -22,9 +28,9 @@ ...@@ -22,9 +28,9 @@
} }
.ecm-card-info { .ecm-card-info {
padding: 6px 0px 8px 8px; padding: 6px 0px 8px 8px;
/*width: calc(100% - 165px);*/ /*width: calc(100% - 165px);
width: calc(100% - 150px); width: calc(100% - 150px);
float: left; float: left;*/
} }
.ecm-card-info-title { .ecm-card-info-title {
font-size: 14px; font-size: 14px;
...@@ -116,10 +122,12 @@ ...@@ -116,10 +122,12 @@
/* position: relative; */ /* position: relative; */
/* top: 15px; */ /* top: 15px; */
/* right: 10px; */ /* right: 10px; */
/*
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
padding: 10px; padding: 10px;
float: right; float: right;
*/
color: #333; color: #333;
} }
...@@ -130,8 +138,8 @@ p { ...@@ -130,8 +138,8 @@ p {
} }
.ecm-ratings{ .ecm-ratings{
/* top: 10px !important; */ /* top: 10px !important;
font-size: 20px; font-size: 20px;*/
color: rgb(500, 150, 50); color: rgb(500, 150, 50);
display: block; display: block;
position: relative; position: relative;
...@@ -151,13 +159,16 @@ p { ...@@ -151,13 +159,16 @@ p {
} }
#ecm-item-info { #ecm-item-info {
padding: 10px; /* padding: 10px;
width: calc(100% - 120px); width: calc(100% - 120px);
padding: 10px;
width: calc(100% - 80px); */
} }
#ecm-item-info-title { #ecm-item-info-title {
line-height: 15px; line-height: 15px;
padding-top: 0px; padding-top: 0px;
display: inline;
} }
#ecm-item-info-subhead { #ecm-item-info-subhead {
...@@ -309,7 +320,42 @@ p { ...@@ -309,7 +320,42 @@ p {
} }
.ecm-item-footer { .ecm-item-footer {
width: 100%;
border-top: 1px solid #f3f3f3; /* border-top: 1px solid #f3f3f3; */
padding: 10px; padding: 10px;
width: 100%;
}
.ecm-discount-rate{
font-weight: bold;
}
.ecm-discount-off{
font-weight: bold;
color: forestgreen;
}
.new{
background: yellow;
font-size: 12px;
padding: 2px;
}
.ecm-total-ratings{
color: #333;
font-weight: bold;
font-size: 12px;
}
.ecm-wishlist-button{
position: absolute;
padding: 8px;
right: 16px;
top: 16px;
height: 40px;
width: 40px;
cursor: pointer;
z-index: 1;
color: darkgray;
} }
.ecm-wishlist-button:hover {
color: mediumvioletred !important;
}
\ No newline at end of file
ecm/Angular/ProteusECM/trunk/src/app/ecm-card/ecm-card.component.html
View file @ b08c7548
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
</div> </div>
<div *ngIf="category" class="ecm-card"> <div *ngIf="category" class="ecm-card" (click)="viewCategories()">
<!-- <img class="ecm-card-img"src="{{category.resourceUrl}}{{category.catCode}}.png"alt="Category image"> --> <!-- <img class="ecm-card-img"src="{{category.resourceUrl}}{{category.catCode}}.png"alt="Category image"> -->
<ecm-image [refId]='category.catCode' [refSer]="'ECMCAT'" [object]="'ECM_CATEGORY'" [attachType]="'Image'"></ecm-image> <ecm-image [refId]='category.catCode' [refSer]="'ECMCAT'" [object]="'ECM_CATEGORY'" [attachType]="'Image'"></ecm-image>
<div class="ecm-card-footer"> <div class="ecm-card-footer">
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
<span class="ecm-card-info-title">{{category.shDescr}}</span> <span class="ecm-card-info-title">{{category.shDescr}}</span>
<span class="ecm-card-info-subhead">{{category.descr}}</span> <span class="ecm-card-info-subhead">{{category.descr}}</span>
</div> </div>
<a md-raised-button *ngIf="!category.catLink" class="ecm-card-action" (click)="viewCategories()">View</a> <!-- <a md-raised-button *ngIf="!category.catLink" class="ecm-card-action" (click)="viewCategories()">View</a> -->
<a *ngIf="!category.catLink" class="ecm-card-action top share" [routerLink]="[ '/share',category.catCode]"></a> <a *ngIf="!category.catLink" class="ecm-card-action top share" [routerLink]="[ '/share',category.catCode]"></a>
</div> </div>
</div> </div>
<div *ngIf="subcategory" class="ecm-card"> <div *ngIf="subcategory" class="ecm-card" (click)="viewProducts()">
<!-- <img class="ecm-card-img"src="{{subcategory.resourceUrl}}{{subcategory.scatCode}}.png"alt="Category image">--> <!-- <img class="ecm-card-img"src="{{subcategory.resourceUrl}}{{subcategory.scatCode}}.png"alt="Category image">-->
<ecm-image [refId]="subcategory.scatCode + ':' + subcategory.catCode" [refSer]="'ECMCAT'" [object]="'ECM_CATEGORY'" [attachType]="'Image'"></ecm-image> <ecm-image [refId]="subcategory.scatCode + ':' + subcategory.catCode" [refSer]="'ECMCAT'" [object]="'ECM_CATEGORY'" [attachType]="'Image'"></ecm-image>
<div class="ecm-card-footer"> <div class="ecm-card-footer">
...@@ -34,27 +34,63 @@ ...@@ -34,27 +34,63 @@
<span class="ecm-card-info-title">{{subcategory.shDescr}}</span> <span class="ecm-card-info-title">{{subcategory.shDescr}}</span>
<span class="ecm-card-info-subhead">{{subcategory.descr}}</span> <span class="ecm-card-info-subhead">{{subcategory.descr}}</span>
</div> </div>
<a md-raised-button *ngIf="!subcategory.catLink" class="ecm-card-action" (click)="viewProducts()">View</a> <!-- <a md-raised-button *ngIf="!subcategory.catLink" class="ecm-card-action" (click)="viewProducts()">View</a> -->
<a *ngIf="!subcategory.catLink" class="ecm-card-action top share" [routerLink]="[ '/share',subcategory.scatCode]"></a> <a *ngIf="!subcategory.catLink" class="ecm-card-action top share" [routerLink]="[ '/share',subcategory.scatCode]"></a>
</div> </div>
</div> </div>
<div *ngIf="itemData" class="ecm-card" id="ecm-item" (click)="viewItem()"> <div *ngIf="itemData" >
<ecm-image [isThumbnail]="true" [refId]='itemData.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image> <!-- <div class="ecm-wishlist-button">
<md-button-toggle class="wishButton">
<md-icon style="position: relative;right: -10px;" *ngIf="!inWishlist" (click)="addToWishlist();">favorite_border</md-icon>
<md-icon style="position: relative;right: -10px;" (click)="removeFromWishlist();" >favorite</md-icon>
</md-button-toggle>
</div> -->
<div class="ecm-card" id="ecm-item" (click)="viewItem()">
<ecm-image [isThumbnail]="true" [refId]='itemData.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image>
<div class="ecm-item-footer"> <div class="ecm-item-footer">
<div class="ecm-card-info" id="ecm-item-info"> <div class="ecm-item-info" id="ecm-item-info">
<span id="ecm-item-info-title" class="ecm-card-info-title">{{itemData.descr}}</span> <span id="ecm-item-info-title" class="ecm-card-info-title">{{itemData.shDescr}}</span>
<span class="new" >New</span>
<!-- <!--
<span *ngIf="itemData.cat_sh_descr && itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{itemData.cat_sh_descr}} - {{itemData.scat_sh_descr}}</span> <span *ngIf="itemData.cat_sh_descr && itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{itemData.cat_sh_descr}} - {{itemData.scat_sh_descr}}</span>
<span *ngIf="extraParam && !itemData.cat_sh_descr && !itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{extraParam.catShDesc}} - {{extraParam.scatDesc}}</span> <span *ngIf="extraParam && !itemData.cat_sh_descr && !itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{extraParam.catShDesc}} - {{extraParam.scatDesc}}</span>
--> -->
</div>
<div class="ecm-card-price"><span class="ecm-rupee"></span><s style="color:lightgray;">Rs. {{itemData.costRate}}</s>
<span class="ecm-discount-rate">Rs. 15,000</span>
<span class="ecm-discount-off">22% off</span>
</div>
<div class="ecm-ratings">
<rating style="vertical-align: sub;" [rate]="3" [isSmallRatings]=true></rating>
<!-- <span *ngFor="let a of createRatings(3);">&#x2605;</span> -->
<span class="ecm-total-ratings">(20,304)</span>
</div>
</div>
</div>
<div class="ecm-wishlist-button">
<md-icon style="color: inherit;" (click)="removeFromWishlist();" >favorite</md-icon>
</div>
</div>
<!-- <div *ngIf="outingData" class="ecm-card" id="ecm-item" (click)="viewItem()">
<ecm-image [isThumbnail]="true" [refId]='itemData.itemCode' [refSer]="'M-ITEM'" [object]="'ITEM'" [isSingleImage] = "true" ></ecm-image>
<div class="ecm-item-footer">
<div class="ecm-card-info" id="ecm-item-info">
<span id="ecm-item-info-title" class="ecm-card-info-title">{{itemData.shDescr}}</span>
<!--
<span *ngIf="itemData.cat_sh_descr && itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{itemData.cat_sh_descr}} - {{itemData.scat_sh_descr}}</span>
<span *ngIf="extraParam && !itemData.cat_sh_descr && !itemData.scat_sh_descr" class="ecm-card-info-subhead" id="ecm-item-info-subhead">{{extraParam.catShDesc}} - {{extraParam.scatDesc}}</span>
<span class="ecm-ratings"> <span class="ecm-ratings">
<span *ngFor="let a of createRatings(itemData.rating);">&#x2605;</span> <span *ngFor="let a of createRatings(itemData.rating);">&#x2605;</span>
</span> </span>
</div> </div>
<div class="ecm-card-price"><span class="ecm-rupee">Rs. </span>{{itemData.costRate}}</div> <div class="ecm-card-price"><span class="ecm-rupee">Rs. </span>{{itemData.costRate}}</div>
</div> </div>
</div> </div> -->
<div *ngIf="reviewsData" class="ecm-reviews"> <div *ngIf="reviewsData" class="ecm-reviews">
<div class="ecm-img"> <span class="circle"> {{reviewsData.reviewBy.charAt(0).toUpperCase()}} </span> </div> <div class="ecm-img"> <span class="circle"> {{reviewsData.reviewBy.charAt(0).toUpperCase()}} </span> </div>
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-carousel/ecm-carousel.component.css
View file @ b08c7548
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
color: white; color: white;
} }
.carousel-cell #ecm-item {
height: 400px !important;
}
/* full height */ /* full height */
.flickity-prev-next-button { .flickity-prev-next-button {
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-header/ecm-header.component.css
View file @ b08c7548
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
} }
.logo-adj { .logo-adj {
position: relative; position: relative;
/*left: calc( ( 100% / 2 ) - 100px );*/ left: calc( ( 100% / 2 ) - 100px );
left: calc( ( 100% / 2 ) - 150px ); /* left: calc( ( 100% / 2 ) - 150px ); */
padding: 0; padding: 0;
padding-bottom: 75px; padding-bottom: 75px;
padding-top: 75px; padding-top: 75px;
...@@ -188,8 +188,8 @@ ecm-search{ ...@@ -188,8 +188,8 @@ ecm-search{
/* top: 0; /* top: 0;
left: 0; left: 0;
position: fixed; position: fixed;
z-index: 4;*/ z-index: 4;
height: 100%; height: 100%; */
top: 13px; top: 13px;
left: 1.5rem; left: 1.5rem;
position: fixed; position: fixed;
...@@ -248,7 +248,13 @@ ecm-search{ ...@@ -248,7 +248,13 @@ ecm-search{
top: 0; top: 0;
left: 0; left: 0;
} }
.overlayPanel-content{
position: relative;
display: block;
height: 100%;
overflow: hidden;
overflow-y: auto;
}
.siteHeading{ .siteHeading{
display : none; display : none;
} }
...@@ -369,8 +375,21 @@ ecm-search{ ...@@ -369,8 +375,21 @@ ecm-search{
color: #fff; color: #fff;
background-color: mediumvioletred; background-color: mediumvioletred;
} }
.ecm-menu-icon {
.cdk-overlay-backdrop.cdk-overlay-backdrop-showing { width: 32px;
opacity: 1 !important; height: 4px;
background: none !important; background-color: black;
margin: 6px 0;
display: block;
cursor: pointer;
} }
@media screen and (max-width: 750px){
.logo-adj{
width: 128px;
left: calc( 50% - 64px );
}
.user-adj {
width: 72px;
left: calc( 100% - 100px );
}
}
\ No newline at end of file
ecm/Angular/ProteusECM/trunk/src/app/ecm-header/ecm-header.component.html
View file @ b08c7548
...@@ -58,10 +58,11 @@ Overlay End --> ...@@ -58,10 +58,11 @@ Overlay End -->
<ng-template #fixedHeaderLarge> <ng-template #fixedHeaderLarge>
<md-toolbar color="primary"> <md-toolbar color="primary">
<span class="ecm-menu-icon"></span> <div>
<span class="ecm-menu-icon"></span> <span class="ecm-menu-icon"></span>
<span class="ecm-menu-icon"></span> <span class="ecm-menu-icon"></span>
<span class="ecm-menu-icon"></span>
</div>
<img class="fixed-header-logo img-logo-32" src="logo_32_32.svg" /> <img class="fixed-header-logo img-logo-32" src="logo_32_32.svg" />
<span class="siteHeading">{{siteHeading}}</span> <span class="siteHeading">{{siteHeading}}</span>
<ecm-search [compFadeState]="headerFadeState" [headerState]="'fixed'"></ecm-search> <ecm-search [compFadeState]="headerFadeState" [headerState]="'fixed'"></ecm-search>
...@@ -84,7 +85,12 @@ Overlay End --> ...@@ -84,7 +85,12 @@ Overlay End -->
</ng-template> </ng-template>
<ng-template #fixedHeaderSmall > <ng-template #fixedHeaderSmall >
<md-toolbar color="primary"> <md-toolbar color="primary">
<div (click)="menuAction();">
<span class="ecm-menu-icon"></span>
<span class="ecm-menu-icon"></span>
<span class="ecm-menu-icon"></span>
</div>
<img class="fixed-header-logo img-logo-32" src="logo_32_32.svg" /> <img class="fixed-header-logo img-logo-32" src="logo_32_32.svg" />
<span class="siteHeading">{{siteHeading}}</span> <span class="siteHeading">{{siteHeading}}</span>
<span class="toolbar-spacer"></span> <span class="toolbar-spacer"></span>
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-header/ecm-header.component.ts
View file @ b08c7548
...@@ -261,6 +261,10 @@ export class ECMHeaderComponent implements OnInit, OnDestroy { ...@@ -261,6 +261,10 @@ export class ECMHeaderComponent implements OnInit, OnDestroy {
this.ecmPanel.updateSize({ width:'100%', height: '60px' }); this.ecmPanel.updateSize({ width:'100%', height: '60px' });
} }
menuAction() {
this.ecmPanel.open({ type: 'overlay', option: 'MENU_OPT', top:'', right: '', width:'80%' });
}
updateProfileImages() { updateProfileImages() {
var userInfo = localStorage.getItem( 'userInfo' ); var userInfo = localStorage.getItem( 'userInfo' );
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-search/ecm-search.component.css
View file @ b08c7548
...@@ -310,3 +310,31 @@ ...@@ -310,3 +310,31 @@
.mat-input-placeholder{ .mat-input-placeholder{
position: relative !important; position: relative !important;
} }
@media screen and (max-width: 750px){
.search-submit,
.locate-me{
display: none;
}
.img-locate{
left: calc( 50% - 10px );
position: relative;
padding: 0px;
top: calc( 50% - 10px );
}
.search-which-border{
width: 15%;
left: 85%;
border-bottom-right-radius: 5px;
border-top-right-radius: 5px;
}
.search-terms {
width: 85%;
}
.search-page-border{
width: 100%;
}
}
\ No newline at end of file
ecm/Angular/ProteusECM/trunk/src/app/ecm-search/ecm-search.component.html
View file @ b08c7548
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</md-autocomplete> </md-autocomplete>
<span class="search-which-border"> <span class="search-which-border">
<div class="locate-me">{{ userLocation.city ? userLocation.city : 'Locate Me' }}</div> <div class="locate-me">{{ userLocation ? userLocation.city : 'Locate Me' }}</div>
<div class="locate-handle" (click)="loacteMe();" ></div> <div class="locate-handle" (click)="loacteMe();" ></div>
<img class="img-locate" title="Locate Me" src="locate_20_20.png"/> <img class="img-locate" title="Locate Me" src="locate_20_20.png"/>
</span> </span>
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<div md-ripple class="location" (click)="loacteMe();"> <div md-ripple class="location" (click)="loacteMe();">
<img class="location-img-32" src="location_32_32.svg"/> <img class="location-img-32" src="location_32_32.svg"/>
<span class="location-text">{{ userLocation.address ? userLocation.address : 'Locate Me' }}</span> <span class="location-text">{{ userLocation ? userLocation.address : 'Locate Me' }}</span>
<i class="material-icons location-arrow">keyboard_arrow_down</i>
</div> </div>
<input class="sb-search-submit" type="submit" (click)="search(myInput.value)"> <input class="sb-search-submit" type="submit" (click)="search(myInput.value)">
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-signin/ecm-signin.component.ts
View file @ b08c7548
...@@ -82,7 +82,7 @@ export class EcmSigninComponent implements OnInit { ...@@ -82,7 +82,7 @@ export class EcmSigninComponent implements OnInit {
console.log( 'comp result.results.indexOf [' + result.Response.results.indexOf('{') + ']' ); console.log( 'comp result.results.indexOf [' + result.Response.results.indexOf('{') + ']' );
this.statusPending = false; this.statusPending = false;
this.statusErrorMsg = null; this.statusErrorMsg = null;
if( result.Response.status == 'success' ) if( result.Response.status == 'Success' )
{ {
alert(result.Response.results); alert(result.Response.results);
this.activeForm = 'verifyForm'; this.activeForm = 'verifyForm';
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-view/ecm-panel/ecm-dialog.html
View file @ b08c7548
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<ecm-signin *ngSwitchCase="'SIGNIN_OPT'" (closePanel)="dialogRef.close();" ></ecm-signin> <ecm-signin *ngSwitchCase="'SIGNIN_OPT'" (closePanel)="dialogRef.close();" ></ecm-signin>
<ecm-cart *ngSwitchCase="'CART_OPT'" [isMiniCart] = 'true' (closePanel)="dialogRef.close();" ></ecm-cart> <ecm-cart *ngSwitchCase="'CART_OPT'" [isMiniCart] = 'true' (closePanel)="dialogRef.close();" ></ecm-cart>
<ecm-user-option *ngSwitchCase="'USER_OPT'" (closePanel)="dialogRef.close();" (updateProfileImages) = "updateProfileImages();" ></ecm-user-option> <ecm-user-option *ngSwitchCase="'USER_OPT'" (closePanel)="dialogRef.close();" (updateProfileImages) = "updateProfileImages();" ></ecm-user-option>
<div *ngSwitchCase="'SEARCH_OPT'"> <div *ngSwitchCase="'SEARCH_OPT'">
<span style="float:left;"> <span style="float:left;">
<button md-button class="square-button" (click)="dialogRef.close()" > <button md-button class="square-button" (click)="dialogRef.close()" >
......
ecm/Angular/ProteusECM/trunk/src/app/ecm-view/ecm-panel/ecm-panel.component.ts
View file @ b08c7548
...@@ -90,6 +90,7 @@ export class EcmPanelComponent implements OnInit { ...@@ -90,6 +90,7 @@ export class EcmPanelComponent implements OnInit {
private showOverlayPanel() { private showOverlayPanel() {
this.overlayPanel.nativeElement.style.display = "block"; this.overlayPanel.nativeElement.style.display = "block";
this.overlayPanel.nativeElement.style.width = this.panelData.width;
this.bgGlass.nativeElement.style.display = "block"; this.bgGlass.nativeElement.style.display = "block";
//document.body.style.overflow = "hidden"; //document.body.style.overflow = "hidden";
disableScroll(); disableScroll();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment