diff --git a/package/DEBIAN/control b/package/DEBIAN/control index b1309ea9..0cc6cd76 100644 --- a/package/DEBIAN/control +++ b/package/DEBIAN/control @@ -1,5 +1,5 @@ Package: hedera-web -Version: 1.0-28 +Version: 1.0-34 Architecture: all Maintainer: Juan Ferrer Toribio Depends: apache2, php5-mysql, php-vn-web diff --git a/package/usr/share/hedera-web/forms/cms/contact/send-data.php b/package/usr/share/hedera-web/forms/cms/contact/send-data.php index 2276f880..8dce55e8 100755 --- a/package/usr/share/hedera-web/forms/cms/contact/send-data.php +++ b/package/usr/share/hedera-web/forms/cms/contact/send-data.php @@ -5,7 +5,6 @@ session_start (); $params = array ( 'name' - ,'surname' ,'pc' ,'phone' ,'email' diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js b/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js index 83cb51aa..7cc42a63 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js @@ -194,7 +194,7 @@ Vn.Catalog = new Class var priceCol = new Htk.ColumnSpin ({ - title: 'AstPrice' + title: 'Price' ,digits: 2 ,unit: '€' ,column: 'price' diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/html.php b/package/usr/share/hedera-web/forms/ecomerce/catalog/html.php index a57917aa..e33a3b7a 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/html.php +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/html.php @@ -63,14 +63,18 @@ - + + + diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css index 395b5130..d272d4ad 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css @@ -32,8 +32,10 @@ min-width: 52em; max-width: 70em; } -#catalog-main p + +#footer-message { + padding-bottom: 1em; text-align: center; } diff --git a/package/usr/share/hedera-web/forms/ecomerce/orders/html.php b/package/usr/share/hedera-web/forms/ecomerce/orders/html.php index 95913c88..10e5fec5 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/orders/html.php +++ b/package/usr/share/hedera-web/forms/ecomerce/orders/html.php @@ -31,7 +31,7 @@ - Info + Info diff --git a/package/usr/share/hedera-web/forms/ecomerce/orders/style.css b/package/usr/share/hedera-web/forms/ecomerce/orders/style.css index 0e491fe6..de60e5fc 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/orders/style.css +++ b/package/usr/share/hedera-web/forms/ecomerce/orders/style.css @@ -50,9 +50,16 @@ { margin-left: 1.2em; } -.positive-debt +#debt-amount { color: white; + padding: 0.3em; +} +.positive-debt +{ + background-color: #ef5350; + border-radius: 0.1em; + box-shadow: 0 0 0.4em #666; } .negative-debt { diff --git a/package/usr/share/hedera-web/global/mobile.css b/package/usr/share/hedera-web/global/mobile.css index 3eba5990..5d811904 100755 --- a/package/usr/share/hedera-web/global/mobile.css +++ b/package/usr/share/hedera-web/global/mobile.css @@ -1,12 +1,124 @@ -/* Responsive */ - -@media screen and (max-device-width: 1200px) and (min-resolution: 100dpi) and (orientation: landscape) +/* Generic */ +@media screen and (orientation: landscape) { - * { font-size: 16pt; } + * { font-size: 13pt; } } -@media screen and (max-device-width: 800px) and (min-resolution: 100dpi) + +@media screen and (orientation: portrait) { * { font-size: 26pt; } } +/* Smartphones (portrait and landscape) */ +@media only screen and (min-device-width : 320px) and (max-device-width : 480px){ + * { font-size: 26pt; } +} + +/* Smartphones (landscape) */ +@media only screen and (min-width : 321px){ + * { font-size: 13pt; } +} + +/* Smartphones (portrait) */ +@media only screen and (max-width : 320px){ + * { font-size: 26pt; } +} + +/* iPads (portrait and landscape) */ +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px){ + * { font-size: 13pt; } +} + +/* iPads (landscape) */ +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : landscape){ + * { font-size: 10pt; } +} + +/* iPads (portrait) */ +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : portrait){ + * { font-size: 13pt; } +} + +/* iPad 3 */ +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : landscape) and (-webkit-min-device-pixel-ratio : 2){ + * { font-size: 10pt; } +} + +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : portrait) and (-webkit-min-device-pixel-ratio : 2){ + * { font-size: 13pt; } +} + +/* Desktops and laptops */ +@media only screen and (min-width : 1224px){ + * { font-size: 13pt; } +} + +/* Large screens */ +@media only screen and (min-width : 1824px){ + * { font-size: 13pt; } +} + +/* iPhone 4 */ +@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation : landscape) and (-webkit-min-device-pixel-ratio : 2){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation : portrait) and (-webkit-min-device-pixel-ratio : 2){ + * { font-size: 26pt; } +} + +/* iPhone 5 */ +@media only screen and (min-device-width: 320px) and (max-device-height: 568px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 320px) and (max-device-height: 568px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 26pt; } +} + +/* iPhone 6 */ +@media only screen and (min-device-width: 375px) and (max-device-height: 667px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 375px) and (max-device-height: 667px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 26pt; } +} + +/* iPhone 6+ */ +@media only screen and (min-device-width: 414px) and (max-device-height: 736px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 414px) and (max-device-height: 736px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 26pt; } +} + +/* Samsung Galaxy S3 */ +@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){ + * { font-size: 26pt; } +} + +/* Samsung Galaxy S4 */ +@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 3){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 3){ + * { font-size: 26pt; } +} + +/* Samsung Galaxy S5 */ +@media only screen and (min-device-width: 360px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 3){ + * { font-size: 13pt; } +} + +@media only screen and (min-device-width: 360px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 3){ + * { font-size: 26pt; } +} + diff --git a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/catalog.json b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/catalog.json index 1e275c14..141ad60e 100755 --- a/package/usr/share/hedera-web/locale/ca/forms/ecomerce/catalog.json +++ b/package/usr/share/hedera-web/locale/ca/forms/ecomerce/catalog.json @@ -25,7 +25,7 @@ ,"Cat": "Cat" ,"Pack": "Pack" ,"Origin": "Origen" - ,"AstPrice": "Preu*" + ,"Price": "Preu" - ,"FixedPrices": "* Els preus resaltats en verd són fixes, la resta són orientatius." + ,"IndicativePhotos": "* Les fotos són orientatives" } diff --git a/package/usr/share/hedera-web/locale/es/forms/ecomerce/catalog.json b/package/usr/share/hedera-web/locale/es/forms/ecomerce/catalog.json index 215cb596..2b4b3413 100755 --- a/package/usr/share/hedera-web/locale/es/forms/ecomerce/catalog.json +++ b/package/usr/share/hedera-web/locale/es/forms/ecomerce/catalog.json @@ -26,7 +26,7 @@ ,"Cat": "Cat" ,"Pack": "Pack" ,"Origin": "Origen" - ,"AstPrice": "Precio*" + ,"Price": "Precio" - ,"FixedPrices": "* Los precios resaltados en verde son fijos, el resto son orientativos." + ,"IndicativePhotos": "* Las fotos son orientativas" } diff --git a/package/usr/share/hedera-web/locale/fr/forms/ecomerce/catalog.json b/package/usr/share/hedera-web/locale/fr/forms/ecomerce/catalog.json index 0dd30442..81320fec 100755 --- a/package/usr/share/hedera-web/locale/fr/forms/ecomerce/catalog.json +++ b/package/usr/share/hedera-web/locale/fr/forms/ecomerce/catalog.json @@ -26,7 +26,7 @@ ,"Cat": "Cat" ,"Pack": "Pack" ,"Origin": "Origine" - ,"AstPrice": "Prix*" + ,"Price": "Prix" - ,"FixedPrices": "* Les prix en vert sont fixes, le reste sont orientatives." + ,"IndicativePhotos": "* Photos sont indicatifs" } diff --git a/package/usr/share/hedera-web/pages/web/web.js b/package/usr/share/hedera-web/pages/web/web.js index 0150cf4a..6aedc473 100755 --- a/package/usr/share/hedera-web/pages/web/web.js +++ b/package/usr/share/hedera-web/pages/web/web.js @@ -31,6 +31,8 @@ Vn.Web = this.conn.on ('loading-changed', this.onConnLoading, this); this.conn.open (null, null, null, this.connOpened.bind (this)); + $('background').onclick = function () {}; + $('menu-button').addEventListener ('click', function (event) { event.stopPropagation ();