Correción de errores
This commit is contained in:
parent
77c9e9bde6
commit
a6a4ef3026
|
@ -1,5 +1,5 @@
|
||||||
Package: hedera-web
|
Package: hedera-web
|
||||||
Version: 1.0-28
|
Version: 1.0-34
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
|
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
|
||||||
Depends: apache2, php5-mysql, php-vn-web
|
Depends: apache2, php5-mysql, php-vn-web
|
||||||
|
|
|
@ -5,7 +5,6 @@ session_start ();
|
||||||
$params = array
|
$params = array
|
||||||
(
|
(
|
||||||
'name'
|
'name'
|
||||||
,'surname'
|
|
||||||
,'pc'
|
,'pc'
|
||||||
,'phone'
|
,'phone'
|
||||||
,'email'
|
,'email'
|
||||||
|
|
|
@ -194,7 +194,7 @@ Vn.Catalog = new Class
|
||||||
|
|
||||||
var priceCol = new Htk.ColumnSpin
|
var priceCol = new Htk.ColumnSpin
|
||||||
({
|
({
|
||||||
title: 'AstPrice'
|
title: 'Price'
|
||||||
,digits: 2
|
,digits: 2
|
||||||
,unit: '€'
|
,unit: '€'
|
||||||
,column: 'price'
|
,column: 'price'
|
||||||
|
|
|
@ -63,14 +63,18 @@
|
||||||
<item name="filter" object="filter"/>
|
<item name="filter" object="filter"/>
|
||||||
</sql-batch>
|
</sql-batch>
|
||||||
</db-model>
|
</db-model>
|
||||||
<htk-column-image column="Foto" directory="catalog" subdir="200x200" show-full="true" editable="true"/>
|
<htk-column-image title="*" column="Foto" directory="catalog" subdir="200x200" show-full="true" editable="true"/>
|
||||||
<htk-column-text title="Pack" column="grouping" format="x%.0d"/>
|
<htk-column-text title="Pack" column="grouping" format="x%.0d"/>
|
||||||
<htk-column-spin title="Aval" column="available"/>
|
<htk-column-spin title="Aval" column="available"/>
|
||||||
<htk-column-text title="Name" column="Article"/>
|
<htk-column-text title="Name" column="Article"/>
|
||||||
<htk-column-text title="Cat" column="Categoria" id="cat"/>
|
<htk-column-text title="Cat" column="Categoria" id="cat"/>
|
||||||
<htk-column-text title="S1" column="Medida"/>
|
<htk-column-text title="S1" column="Medida"/>
|
||||||
|
<htk-column-text title="Color" column="Color"/>
|
||||||
<htk-column-text title="Origin" column="Abreviatura"/>
|
<htk-column-text title="Origin" column="Abreviatura"/>
|
||||||
</htk-grid>
|
</htk-grid>
|
||||||
|
<p id="footer-message">
|
||||||
|
<?=s('IndicativePhotos')?>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -32,8 +32,10 @@
|
||||||
min-width: 52em;
|
min-width: 52em;
|
||||||
max-width: 70em;
|
max-width: 70em;
|
||||||
}
|
}
|
||||||
#catalog-main p
|
|
||||||
|
#footer-message
|
||||||
{
|
{
|
||||||
|
padding-bottom: 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<htk-label format="%.2d€" id="debt-amount">
|
<htk-label format="%.2d€" id="debt-amount">
|
||||||
<db-calc-sum model="balance" column-name="amount"/>
|
<db-calc-sum model="balance" column-name="amount"/>
|
||||||
</htk-label>
|
</htk-label>
|
||||||
<img src="image/dark/info.svg" title="<?=s('PaymentInfo')?>" alt="Info"/>
|
<img src="image/dark/info.svg" title="<?=s('PaymentInfo')?>" id="debt-info" alt="Info"/>
|
||||||
<button id="pay-button" title="<?=s('MakePayment')?>">
|
<button id="pay-button" title="<?=s('MakePayment')?>">
|
||||||
<img src="image/dark/pay.svg" alt="<?=s('MakePayment')?>"/>
|
<img src="image/dark/pay.svg" alt="<?=s('MakePayment')?>"/>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -50,9 +50,16 @@
|
||||||
{
|
{
|
||||||
margin-left: 1.2em;
|
margin-left: 1.2em;
|
||||||
}
|
}
|
||||||
.positive-debt
|
#debt-amount
|
||||||
{
|
{
|
||||||
color: white;
|
color: white;
|
||||||
|
padding: 0.3em;
|
||||||
|
}
|
||||||
|
.positive-debt
|
||||||
|
{
|
||||||
|
background-color: #ef5350;
|
||||||
|
border-radius: 0.1em;
|
||||||
|
box-shadow: 0 0 0.4em #666;
|
||||||
}
|
}
|
||||||
.negative-debt
|
.negative-debt
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,12 +1,124 @@
|
||||||
|
|
||||||
/* Responsive */
|
/* Generic */
|
||||||
|
@media screen and (orientation: landscape)
|
||||||
@media screen and (max-device-width: 1200px) and (min-resolution: 100dpi) 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; }
|
* { 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; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
,"Cat": "Cat"
|
,"Cat": "Cat"
|
||||||
,"Pack": "Pack"
|
,"Pack": "Pack"
|
||||||
,"Origin": "Origen"
|
,"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"
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
,"Cat": "Cat"
|
,"Cat": "Cat"
|
||||||
,"Pack": "Pack"
|
,"Pack": "Pack"
|
||||||
,"Origin": "Origen"
|
,"Origin": "Origen"
|
||||||
,"AstPrice": "Precio*"
|
,"Price": "Precio"
|
||||||
|
|
||||||
,"FixedPrices": "* Los precios resaltados en verde son fijos, el resto son orientativos."
|
,"IndicativePhotos": "* Las fotos son orientativas"
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
,"Cat": "Cat"
|
,"Cat": "Cat"
|
||||||
,"Pack": "Pack"
|
,"Pack": "Pack"
|
||||||
,"Origin": "Origine"
|
,"Origin": "Origine"
|
||||||
,"AstPrice": "Prix*"
|
,"Price": "Prix"
|
||||||
|
|
||||||
,"FixedPrices": "* Les prix en vert sont fixes, le reste sont orientatives."
|
,"IndicativePhotos": "* Photos sont indicatifs"
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,8 @@ Vn.Web =
|
||||||
this.conn.on ('loading-changed', this.onConnLoading, this);
|
this.conn.on ('loading-changed', this.onConnLoading, this);
|
||||||
this.conn.open (null, null, null, this.connOpened.bind (this));
|
this.conn.open (null, null, null, this.connOpened.bind (this));
|
||||||
|
|
||||||
|
$('background').onclick = function () {};
|
||||||
|
|
||||||
$('menu-button').addEventListener ('click', function (event)
|
$('menu-button').addEventListener ('click', function (event)
|
||||||
{
|
{
|
||||||
event.stopPropagation ();
|
event.stopPropagation ();
|
||||||
|
|
Loading…
Reference in New Issue