From d64160d89115193d42138bb70d28a22e2ed34353 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sun, 15 Mar 2015 13:44:57 +0100 Subject: [PATCH] Htk.Repater beta, errores solucionados --- .../forms/agencies/provinces/provinces.js | 2 - .../forms/agencies/provinces/ui.xml | 1 - .../share/hedera-web/forms/cms/about/ui.xml | 172 +++++++++--------- .../hedera-web/forms/cms/contact/contact.js | 4 +- .../share/hedera-web/forms/cms/home/home.js | 2 - .../hedera-web/forms/cms/training/training.js | 2 - .../forms/ecomerce/catalog/catalog.js | 6 +- .../forms/ecomerce/catalog/style.css | 35 +++- .../hedera-web/forms/ecomerce/catalog/ui.xml | 30 ++- .../hedera-web/forms/ecomerce/ticket/ui.xml | 32 ++-- package/usr/share/hedera-web/global/style.css | 34 +++- package/usr/share/hedera-web/index.php | 6 +- .../hedera-web/js/htk/field/date-chooser.js | 2 +- .../usr/share/hedera-web/js/htk/field/spin.js | 14 +- .../usr/share/hedera-web/js/htk/repeater.js | 86 ++++++--- package/usr/share/hedera-web/js/htk/toast.js | 19 +- package/usr/share/hedera-web/js/htk/widget.js | 5 + .../hedera-web/pages/login/background.png | Bin 24400 -> 0 bytes package/usr/share/hedera-web/unavailable.html | 4 +- package/usr/share/php/vn/hedera/web.php | 10 +- 20 files changed, 282 insertions(+), 184 deletions(-) delete mode 100644 package/usr/share/hedera-web/pages/login/background.png diff --git a/package/usr/share/hedera-web/forms/agencies/provinces/provinces.js b/package/usr/share/hedera-web/forms/agencies/provinces/provinces.js index 7e4d9d01..8e799ba2 100755 --- a/package/usr/share/hedera-web/forms/agencies/provinces/provinces.js +++ b/package/usr/share/hedera-web/forms/agencies/provinces/provinces.js @@ -2,7 +2,5 @@ Vn.Provinces = new Class ({ Extends: Vn.Module - - ,activate: function () {} }); diff --git a/package/usr/share/hedera-web/forms/agencies/provinces/ui.xml b/package/usr/share/hedera-web/forms/agencies/provinces/ui.xml index 42edc8b5..08845cec 100755 --- a/package/usr/share/hedera-web/forms/agencies/provinces/ui.xml +++ b/package/usr/share/hedera-web/forms/agencies/provinces/ui.xml @@ -3,7 +3,6 @@ -
diff --git a/package/usr/share/hedera-web/forms/cms/about/ui.xml b/package/usr/share/hedera-web/forms/cms/about/ui.xml index 77667e3f..0a1589a2 100755 --- a/package/usr/share/hedera-web/forms/cms/about/ui.xml +++ b/package/usr/share/hedera-web/forms/cms/about/ui.xml @@ -1,97 +1,97 @@
-
-
-

QualityAndVariety

+
+
+

QualityAndVariety

+
+

MaximumFreshness

+

SquareMeters

+ store +

AboutRealms

+

AboutLocation

+ trailer +

+ dealer + PurchaseThroughWeb +

+ palletizing
-

MaximumFreshness

-

SquareMeters

- store -

AboutRealms

-

AboutLocation

- trailer -

- dealer - PurchaseThroughWeb -

- palletizing -
-
-
-

WhatMakeUsDifferent

+
+
+

WhatMakeUsDifferent

+
+

DesignVariety

+ differentiates_us +

AdaptToYourNeeds

+

TheBestQuality

-

DesignVariety

- differentiates_us -

AdaptToYourNeeds

-

TheBestQuality

-
-
-
-

AtYourService

+
+
+

AtYourService

+
+

BuyersAndTraders

+ commercial
-

BuyersAndTraders

- commercial -
-
-
-

Training

+
+
+

Training

+
+

GoodTraining

+ training +

SpecialTrainingPrices

+ courses +

YoutubeChannel

+ youtube
-

GoodTraining

- training -

SpecialTrainingPrices

- courses -

YoutubeChannel

- youtube -
-
-
-

HowWeWork

+
+
+

HowWeWork

+
+

AalsmeerAuction

+ auction +

BeforeAuction

+ producers +

DirectlyFromProviders

+

GoodsDischarge

+ goods_transport +

+ FirstQualityControl + glass +

+ goods_receive +

GoodsTravel

+ 2_control +

GoodsReception

+

+ SecondQualityControl + glass +

+

CustomerOrders

+ web +

AfterOrder

+ 4_control +

+ ThirdQualityControl + glass +

+

BuyerControl

+

+ FourthQualityControl + glass +

+

EmbeddedSection

+ fit +

AfterEmbedAgency

+ agencies +

FreshnessGuaranteed

+
+
+

+ AboutSummary + Verdnatura +

-

AalsmeerAuction

- auction -

BeforeAuction

- producers -

DirectlyFromProviders

-

GoodsDischarge

- goods_transport -

- FirstQualityControl - glass -

- goods_receive -

GoodsTravel

- 2_control -

GoodsReception

-

- SecondQualityControl - glass -

-

CustomerOrders

- web -

AfterOrder

- 4_control -

- ThirdQualityControl - glass -

-

BuyerControl

-

- FourthQualityControl - glass -

-

EmbeddedSection

- fit -

AfterEmbedAgency

- agencies -

FreshnessGuaranteed

-
-
-

- AboutSummary - Verdnatura -

-
diff --git a/package/usr/share/hedera-web/forms/cms/contact/contact.js b/package/usr/share/hedera-web/forms/cms/contact/contact.js index 98fddfc9..77eef1ad 100755 --- a/package/usr/share/hedera-web/forms/cms/contact/contact.js +++ b/package/usr/share/hedera-web/forms/cms/contact/contact.js @@ -33,10 +33,10 @@ Vn.Contact = new Class if (response) { form.reset (); - alert (_('DataSentSuccess')); + (new Htk.Toast ()).showMessage (_('DataSentSuccess')); } else - alert (_('ErrorSendingData')); + (new Htk.Toast ()).showError (_('ErrorSendingData')); form['captcha'].value = ''; this.refreshCaptcha (); diff --git a/package/usr/share/hedera-web/forms/cms/home/home.js b/package/usr/share/hedera-web/forms/cms/home/home.js index 2a28d022..2f099370 100755 --- a/package/usr/share/hedera-web/forms/cms/home/home.js +++ b/package/usr/share/hedera-web/forms/cms/home/home.js @@ -2,7 +2,5 @@ Vn.Home = new Class ({ Extends: Vn.Module - - ,activate: function () {} }); diff --git a/package/usr/share/hedera-web/forms/cms/training/training.js b/package/usr/share/hedera-web/forms/cms/training/training.js index 6c6e8b8e..d9cca5cb 100755 --- a/package/usr/share/hedera-web/forms/cms/training/training.js +++ b/package/usr/share/hedera-web/forms/cms/training/training.js @@ -2,6 +2,4 @@ Vn.Training = new Class ({ Extends: Vn.Module - - ,activate: function () {} }); 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 e4777508..3a069924 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js @@ -12,14 +12,12 @@ Vn.Catalog = new Class model.setFieldFlags ('id', Db.Conn.Flag.AI); model.setFieldFlags ('Id_Article', Db.Conn.Flag.PRI_KEY); + this.$('type-column').renderer = this.typeRenderer.bind (this); + this.$('cat').renderer = this.catRenderer; this.$('basket-button').addEventListener ('click', this.basketClicked.bind (this)); this.$('menu-button').addEventListener ('click', this.showMenu.bind (this)); this.$('menu').addEventListener ('click', this.onMenuClick.bind (this)); this.$('search-entry').addEventListener ('change', this.onSearch.bind (this)); - - this.$('type-column').renderer = this.typeRenderer.bind (this); - this.$('cat').renderer = this.catRenderer; - this.$('realms-model').on ('status-changed', this.onRealmsReload.bind (this)); this.$('realms').on ('changed', this.onRealmChanged.bind (this)); this.$('types-model').on ('status-changed', this.onTypesReload.bind (this)); 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 9f653b47..9bee6b1b 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/style.css @@ -184,21 +184,44 @@ table.types td.grid-message padding-top: 1em; } -/* Box view */ +/* Grid view */ .item-box { padding: 1em; border-bottom: 1px solid #DDD; - height: 14em; + min-height: 14em; } - -.item-box img +.item-box > .image { + width: 8em; + height: 14em; float: left; margin-right: 1em; - max-width: 14em; - max-height: 14em; +} +.item-box img +{ + max-width: 8em; + max-height: 8em; + display: block; + margin: 0 auto; +} +.item-box p +{ + margin: 0; + padding: 0.6em; +} +.item-box h2 +{ + font-weight: normal; +} +.item-box .amount +{ + width: 3em; +} +.amount-p +{ + text-align: right; } /* List view */ diff --git a/package/usr/share/hedera-web/forms/ecomerce/catalog/ui.xml b/package/usr/share/hedera-web/forms/ecomerce/catalog/ui.xml index a93aa4a3..378e1aaf 100755 --- a/package/usr/share/hedera-web/forms/ecomerce/catalog/ui.xml +++ b/package/usr/share/hedera-web/forms/ecomerce/catalog/ui.xml @@ -65,15 +65,33 @@