Browse Source

Shop basket progress

Vova Tkach 5 years ago
parent
commit
6d542116fe

+ 1 - 1
assets/template/header_html_file.go

@@ -53,7 +53,7 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 							<li class="nav-item">
 								<a id="basket-nav-btn" class="nav-link" href="" onclick="window&&window.frontend&&frontend.ShopBasketBtnCollapse()&&frontend.ShopBasketOpen(this);return false;">Basket <span class="badge badge-pill badge-primary">{{$.Data.ShopBasketProductsCount}}</span></a>
 							</li>
-							<li>
+							<li class="currency-changer">
 								<select class="form-control" onchange="document.location.reload(true);">
 									{{range $.Data.Shop.Currencies}}
 										<option value="{{.Id}}"{{if eq .Id $.Data.Shop.CurrentCurrency.Id}} selected{{end}}>{{.Code}}</option>

+ 7 - 5
assets/template/shop_product_html_file.go

@@ -19,11 +19,13 @@ var VarShopProductHtmlFile = []byte(`{{template "header.html" .}}
 				<div class="row">
 					<div class="col-md-6">
 						<div class="card" id="product_image">
-							{{if $.Data.Shop.Product.HaveImages}}
-								<img class="card-img-top" src="{{$.Data.Shop.Product.Image.Thumbnail3}}" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
-							{{else}}
-								<img class="card-img-top" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22286%22%20height%3D%22180%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20286%20180%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_16c7e5ac360%20text%20%7B%20fill%3Argba(255%2C255%2C255%2C.75)%3Bfont-weight%3Anormal%3Bfont-family%3AHelvetica%2C%20monospace%3Bfont-size%3A14pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_16c7e5ac360%22%3E%3Crect%20width%3D%22286%22%20height%3D%22180%22%20fill%3D%22%23777%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%22107.0078125%22%20y%3D%2296.234375%22%3E286x180%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
-							{{end}}
+							<div class="card-body">
+								{{if $.Data.Shop.Product.HaveImages}}
+									<img class="card-img-top" src="{{$.Data.Shop.Product.Image.Thumbnail3}}" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
+								{{else}}
+									<img class="card-img-top" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22286%22%20height%3D%22180%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20286%20180%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_16c7e5ac360%20text%20%7B%20fill%3Argba(255%2C255%2C255%2C.75)%3Bfont-weight%3Anormal%3Bfont-family%3AHelvetica%2C%20monospace%3Bfont-size%3A14pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_16c7e5ac360%22%3E%3Crect%20width%3D%22286%22%20height%3D%22180%22%20fill%3D%22%23777%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%22107.0078125%22%20y%3D%2296.234375%22%3E286x180%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
+								{{end}}
+							</div>
 						</div>
 						{{if $.Data.Shop.Product.HaveImages}}
 							<div class="card mt-1">

+ 10 - 0
assets/template/styles_css_file.go

@@ -389,11 +389,13 @@ footer {
 
 	#sys-modal-shop-basket .modal-footer>:not(:last-child) {
 		margin-right: 0px;
+		display: block;
 	}
 
 	#sys-modal-shop-basket .modal-footer>:not(:first-child) {
 		margin-left: 0px;
 		margin-top: 1rem;
+		display: block;
 	}
 }
 
@@ -415,6 +417,10 @@ footer {
 	#sys-modal-shop-basket .data .table .thc-3 {
 		display: table-cell;
 	}
+
+	li.currency-changer {
+		padding-right: 8px;
+	}
 }
 
 @media (min-width: 1200px) {
@@ -425,4 +431,8 @@ footer {
 	#sys-modal-shop-basket .data .table .thc-3 {
 		display: table-cell;
 	}
+
+	li.currency-changer {
+		padding-right: 8px;
+	}
 }`)

+ 1 - 1
hosts/localhost/template/header.html

@@ -51,7 +51,7 @@
 							<li class="nav-item">
 								<a id="basket-nav-btn" class="nav-link" href="" onclick="window&&window.frontend&&frontend.ShopBasketBtnCollapse()&&frontend.ShopBasketOpen(this);return false;">Basket <span class="badge badge-pill badge-primary">{{$.Data.ShopBasketProductsCount}}</span></a>
 							</li>
-							<li>
+							<li class="currency-changer">
 								<select class="form-control" onchange="document.location.reload(true);">
 									{{range $.Data.Shop.Currencies}}
 										<option value="{{.Id}}"{{if eq .Id $.Data.Shop.CurrentCurrency.Id}} selected{{end}}>{{.Code}}</option>

+ 7 - 5
hosts/localhost/template/shop-product.html

@@ -17,11 +17,13 @@
 				<div class="row">
 					<div class="col-md-6">
 						<div class="card" id="product_image">
-							{{if $.Data.Shop.Product.HaveImages}}
-								<img class="card-img-top" src="{{$.Data.Shop.Product.Image.Thumbnail3}}" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
-							{{else}}
-								<img class="card-img-top" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22286%22%20height%3D%22180%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20286%20180%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_16c7e5ac360%20text%20%7B%20fill%3Argba(255%2C255%2C255%2C.75)%3Bfont-weight%3Anormal%3Bfont-family%3AHelvetica%2C%20monospace%3Bfont-size%3A14pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_16c7e5ac360%22%3E%3Crect%20width%3D%22286%22%20height%3D%22180%22%20fill%3D%22%23777%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%22107.0078125%22%20y%3D%2296.234375%22%3E286x180%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
-							{{end}}
+							<div class="card-body">
+								{{if $.Data.Shop.Product.HaveImages}}
+									<img class="card-img-top" src="{{$.Data.Shop.Product.Image.Thumbnail3}}" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
+								{{else}}
+									<img class="card-img-top" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%22286%22%20height%3D%22180%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20286%20180%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_16c7e5ac360%20text%20%7B%20fill%3Argba(255%2C255%2C255%2C.75)%3Bfont-weight%3Anormal%3Bfont-family%3AHelvetica%2C%20monospace%3Bfont-size%3A14pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_16c7e5ac360%22%3E%3Crect%20width%3D%22286%22%20height%3D%22180%22%20fill%3D%22%23777%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%22107.0078125%22%20y%3D%2296.234375%22%3E286x180%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" alt="{{$.Data.EscapeString $.Data.Shop.Product.Name}}">
+								{{end}}
+							</div>
 						</div>
 						{{if $.Data.Shop.Product.HaveImages}}
 							<div class="card mt-1">

+ 10 - 0
hosts/localhost/template/styles.css

@@ -387,11 +387,13 @@ footer {
 
 	#sys-modal-shop-basket .modal-footer>:not(:last-child) {
 		margin-right: 0px;
+		display: block;
 	}
 
 	#sys-modal-shop-basket .modal-footer>:not(:first-child) {
 		margin-left: 0px;
 		margin-top: 1rem;
+		display: block;
 	}
 }
 
@@ -413,6 +415,10 @@ footer {
 	#sys-modal-shop-basket .data .table .thc-3 {
 		display: table-cell;
 	}
+
+	li.currency-changer {
+		padding-right: 8px;
+	}
 }
 
 @media (min-width: 1200px) {
@@ -423,4 +429,8 @@ footer {
 	#sys-modal-shop-basket .data .table .thc-3 {
 		display: table-cell;
 	}
+
+	li.currency-changer {
+		padding-right: 8px;
+	}
 }