diff --git a/debian/conf/config.php b/debian/conf/config.php index 1ee3ec59..13770791 100755 --- a/debian/conf/config.php +++ b/debian/conf/config.php @@ -13,7 +13,7 @@ * - http://www.mydomain.org -> config.www.php * - http://test.mydomain.org -> config.test.php **/ -$conf = [ +return [ /** * Database parameters. diff --git a/lib/vn/hedera/web.php b/lib/vn/hedera/web.php index 235d34e7..ee23db5d 100755 --- a/lib/vn/hedera/web.php +++ b/lib/vn/hedera/web.php @@ -138,7 +138,7 @@ class Web else $confFile = _CONFIG_DIR .'/config.php'; - require ($confFile); + $conf = require ($confFile); self::$confIncluded = TRUE; } diff --git a/web/forms/account/address-list/address-list.js b/web/forms/account/address-list/address-list.js old mode 100755 new mode 100644 diff --git a/web/forms/account/address-list/style.css b/web/forms/account/address-list/style.css old mode 100755 new mode 100644 diff --git a/web/forms/account/address/address.js b/web/forms/account/address/address.js old mode 100755 new mode 100644 diff --git a/web/forms/account/address/style.css b/web/forms/account/address/style.css old mode 100755 new mode 100644 diff --git a/web/forms/account/conf/conf.js b/web/forms/account/conf/conf.js old mode 100755 new mode 100644 diff --git a/web/forms/account/conf/style.css b/web/forms/account/conf/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/access-log/access-log.js b/web/forms/admin/access-log/access-log.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/access-log/style.css b/web/forms/admin/access-log/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/connections/connections.js b/web/forms/admin/connections/connections.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/connections/style.css b/web/forms/admin/connections/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/items/items.js b/web/forms/admin/items/items.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/items/style.css b/web/forms/admin/items/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/links/links.js b/web/forms/admin/links/links.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/links/style.css b/web/forms/admin/links/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/photos/photos.js b/web/forms/admin/photos/photos.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/photos/style.css b/web/forms/admin/photos/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/queries/queries.js b/web/forms/admin/queries/queries.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/queries/style.css b/web/forms/admin/queries/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/shelves/shelves.js b/web/forms/admin/shelves/shelves.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/shelves/style.css b/web/forms/admin/shelves/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/users/style.css b/web/forms/admin/users/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/users/users.js b/web/forms/admin/users/users.js old mode 100755 new mode 100644 diff --git a/web/forms/admin/visits/style.css b/web/forms/admin/visits/style.css old mode 100755 new mode 100644 diff --git a/web/forms/admin/visits/visits.js b/web/forms/admin/visits/visits.js old mode 100755 new mode 100644 diff --git a/web/forms/agencies/packages/packages.js b/web/forms/agencies/packages/packages.js old mode 100755 new mode 100644 diff --git a/web/forms/agencies/packages/style.css b/web/forms/agencies/packages/style.css old mode 100755 new mode 100644 diff --git a/web/forms/agencies/provinces/provinces.js b/web/forms/agencies/provinces/provinces.js old mode 100755 new mode 100644 diff --git a/web/forms/agencies/provinces/style.css b/web/forms/agencies/provinces/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/about/about.js b/web/forms/cms/about/about.js old mode 100755 new mode 100644 diff --git a/web/forms/cms/about/image/2_control.png b/web/forms/cms/about/image/2_control.png old mode 100755 new mode 100644 index baf92e2e..a184fc47 Binary files a/web/forms/cms/about/image/2_control.png and b/web/forms/cms/about/image/2_control.png differ diff --git a/web/forms/cms/about/image/4_control.png b/web/forms/cms/about/image/4_control.png old mode 100755 new mode 100644 index e40677f9..c5690c75 Binary files a/web/forms/cms/about/image/4_control.png and b/web/forms/cms/about/image/4_control.png differ diff --git a/web/forms/cms/about/image/agencies.png b/web/forms/cms/about/image/agencies.png old mode 100755 new mode 100644 index 22efc294..7e4f8b9b Binary files a/web/forms/cms/about/image/agencies.png and b/web/forms/cms/about/image/agencies.png differ diff --git a/web/forms/cms/about/image/auction.png b/web/forms/cms/about/image/auction.png old mode 100755 new mode 100644 index 2c6c71b8..ae8099c3 Binary files a/web/forms/cms/about/image/auction.png and b/web/forms/cms/about/image/auction.png differ diff --git a/web/forms/cms/about/image/commercial.png b/web/forms/cms/about/image/commercial.png old mode 100755 new mode 100644 index 9047d848..3046e843 Binary files a/web/forms/cms/about/image/commercial.png and b/web/forms/cms/about/image/commercial.png differ diff --git a/web/forms/cms/about/image/courses.png b/web/forms/cms/about/image/courses.png old mode 100755 new mode 100644 index 95e78235..c951b85e Binary files a/web/forms/cms/about/image/courses.png and b/web/forms/cms/about/image/courses.png differ diff --git a/web/forms/cms/about/image/dealer.png b/web/forms/cms/about/image/dealer.png old mode 100755 new mode 100644 index 6d306d1b..4ac64400 Binary files a/web/forms/cms/about/image/dealer.png and b/web/forms/cms/about/image/dealer.png differ diff --git a/web/forms/cms/about/image/differentiates_us.png b/web/forms/cms/about/image/differentiates_us.png old mode 100755 new mode 100644 index 0ba177e9..bd9727f1 Binary files a/web/forms/cms/about/image/differentiates_us.png and b/web/forms/cms/about/image/differentiates_us.png differ diff --git a/web/forms/cms/about/image/fit.png b/web/forms/cms/about/image/fit.png old mode 100755 new mode 100644 index 27d36e60..93e36a53 Binary files a/web/forms/cms/about/image/fit.png and b/web/forms/cms/about/image/fit.png differ diff --git a/web/forms/cms/about/image/glass.png b/web/forms/cms/about/image/glass.png old mode 100755 new mode 100644 index 53bfc34f..170e1d08 Binary files a/web/forms/cms/about/image/glass.png and b/web/forms/cms/about/image/glass.png differ diff --git a/web/forms/cms/about/image/goods_receive.png b/web/forms/cms/about/image/goods_receive.png old mode 100755 new mode 100644 index ac0a3b50..bb16c098 Binary files a/web/forms/cms/about/image/goods_receive.png and b/web/forms/cms/about/image/goods_receive.png differ diff --git a/web/forms/cms/about/image/goods_transport.png b/web/forms/cms/about/image/goods_transport.png old mode 100755 new mode 100644 index 18ae6dc4..72f906b9 Binary files a/web/forms/cms/about/image/goods_transport.png and b/web/forms/cms/about/image/goods_transport.png differ diff --git a/web/forms/cms/about/image/palletizing.png b/web/forms/cms/about/image/palletizing.png old mode 100755 new mode 100644 index 3fec9c36..12be2c70 Binary files a/web/forms/cms/about/image/palletizing.png and b/web/forms/cms/about/image/palletizing.png differ diff --git a/web/forms/cms/about/image/producers.png b/web/forms/cms/about/image/producers.png old mode 100755 new mode 100644 index 0a8949d5..c6d05c7d Binary files a/web/forms/cms/about/image/producers.png and b/web/forms/cms/about/image/producers.png differ diff --git a/web/forms/cms/about/image/store.png b/web/forms/cms/about/image/store.png old mode 100755 new mode 100644 index 266be20c..a280989e Binary files a/web/forms/cms/about/image/store.png and b/web/forms/cms/about/image/store.png differ diff --git a/web/forms/cms/about/image/summary.png b/web/forms/cms/about/image/summary.png old mode 100755 new mode 100644 index 7e3fc8e3..5532302f Binary files a/web/forms/cms/about/image/summary.png and b/web/forms/cms/about/image/summary.png differ diff --git a/web/forms/cms/about/image/trailer.png b/web/forms/cms/about/image/trailer.png old mode 100755 new mode 100644 index accd4db6..f5f15eb8 Binary files a/web/forms/cms/about/image/trailer.png and b/web/forms/cms/about/image/trailer.png differ diff --git a/web/forms/cms/about/image/training.png b/web/forms/cms/about/image/training.png old mode 100755 new mode 100644 index 4e925700..334b4c1c Binary files a/web/forms/cms/about/image/training.png and b/web/forms/cms/about/image/training.png differ diff --git a/web/forms/cms/about/image/web.png b/web/forms/cms/about/image/web.png old mode 100755 new mode 100644 index bbdb4903..261625ea Binary files a/web/forms/cms/about/image/web.png and b/web/forms/cms/about/image/web.png differ diff --git a/web/forms/cms/about/image/youtube.png b/web/forms/cms/about/image/youtube.png old mode 100755 new mode 100644 index 2be1cc74..6147c272 Binary files a/web/forms/cms/about/image/youtube.png and b/web/forms/cms/about/image/youtube.png differ diff --git a/web/forms/cms/about/style.css b/web/forms/cms/about/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/contact/contact.js b/web/forms/cms/contact/contact.js old mode 100755 new mode 100644 diff --git a/web/forms/cms/contact/style.css b/web/forms/cms/contact/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/home/home.js b/web/forms/cms/home/home.js old mode 100755 new mode 100644 diff --git a/web/forms/cms/home/style.css b/web/forms/cms/home/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/location/location.js b/web/forms/cms/location/location.js old mode 100755 new mode 100644 diff --git a/web/forms/cms/location/style.css b/web/forms/cms/location/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/training/style.css b/web/forms/cms/training/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/training/training.js b/web/forms/cms/training/training.js old mode 100755 new mode 100644 diff --git a/web/forms/cms/why/style.css b/web/forms/cms/why/style.css old mode 100755 new mode 100644 diff --git a/web/forms/cms/why/why.js b/web/forms/cms/why/why.js old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/basket/basket.js b/web/forms/ecomerce/basket/basket.js old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/basket/style.css b/web/forms/ecomerce/basket/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js old mode 100755 new mode 100644 index e7a7f012..9117a6db --- a/web/forms/ecomerce/catalog/catalog.js +++ b/web/forms/ecomerce/catalog/catalog.js @@ -46,7 +46,7 @@ Vn.Catalog = new Class this.gui.$('top-bar').style.backgroundColor = ''; Vn.Node.remove (this.$('right-panel')); } - + ,setView: function (view) { if (view === Vn.Catalog.View.GRID) @@ -248,7 +248,7 @@ Vn.Catalog = new Class else Htk.Toast.showError (_('YouMustBeLoggedIn')); } - + ,onConfigureClick: function () { if (!Vn.Cookie.check ('hedera_guest')) diff --git a/web/forms/ecomerce/catalog/mobile.css b/web/forms/ecomerce/catalog/mobile.css deleted file mode 100755 index 1d690fb5..00000000 --- a/web/forms/ecomerce/catalog/mobile.css +++ /dev/null @@ -1,13 +0,0 @@ - -.catalog button.menu -{ - display: block; -} -.catalog div.center -{ - right: 0; -} -.right-panel -{ - display: none; -} diff --git a/web/forms/ecomerce/catalog/style.css b/web/forms/ecomerce/catalog/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml index ab5a5704..9908a124 100755 --- a/web/forms/ecomerce/catalog/ui.xml +++ b/web/forms/ecomerce/catalog/ui.xml @@ -177,60 +177,8 @@

-<<<<<<< HEAD - -
diff --git a/web/forms/ecomerce/checkout/checkout.js b/web/forms/ecomerce/checkout/checkout.js old mode 100755 new mode 100644 index 7eb04457..fc00e589 --- a/web/forms/ecomerce/checkout/checkout.js +++ b/web/forms/ecomerce/checkout/checkout.js @@ -196,7 +196,8 @@ Vn.Checkout = new Class ,calendarRestrict: function (date) { - return date.getTime () >= this.today.getTime (); + return date.getTime () >= this.today.getTime () + && date.getDay () != 0; } }); diff --git a/web/forms/ecomerce/checkout/style.css b/web/forms/ecomerce/checkout/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/confirm/confirm.js b/web/forms/ecomerce/confirm/confirm.js old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/confirm/style.css b/web/forms/ecomerce/confirm/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/confirm/ui.xml b/web/forms/ecomerce/confirm/ui.xml index bd6d14e0..c059b9ab 100755 --- a/web/forms/ecomerce/confirm/ui.xml +++ b/web/forms/ecomerce/confirm/ui.xml @@ -187,7 +187,7 @@ - +

diff --git a/web/forms/ecomerce/invoices/invoices.js b/web/forms/ecomerce/invoices/invoices.js old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/invoices/style.css b/web/forms/ecomerce/invoices/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/orders/orders.js b/web/forms/ecomerce/orders/orders.js old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/orders/style.css b/web/forms/ecomerce/orders/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/ticket/style.css b/web/forms/ecomerce/ticket/style.css old mode 100755 new mode 100644 diff --git a/web/forms/ecomerce/ticket/ticket.js b/web/forms/ecomerce/ticket/ticket.js old mode 100755 new mode 100644 diff --git a/web/forms/news/new/new.js b/web/forms/news/new/new.js old mode 100755 new mode 100644 diff --git a/web/forms/news/new/style.css b/web/forms/news/new/style.css old mode 100755 new mode 100644 diff --git a/web/forms/news/news/news.js b/web/forms/news/news/news.js old mode 100755 new mode 100644 diff --git a/web/forms/news/news/style.css b/web/forms/news/news/style.css old mode 100755 new mode 100644 diff --git a/web/image/dark/logo.png b/web/image/dark/logo.png old mode 100755 new mode 100644 index 22a86e96..6c485352 Binary files a/web/image/dark/logo.png and b/web/image/dark/logo.png differ diff --git a/web/image/debian.png b/web/image/debian.png old mode 100755 new mode 100644 index 07fb3ef6..2943f3a0 Binary files a/web/image/debian.png and b/web/image/debian.png differ diff --git a/web/image/invisible.png b/web/image/invisible.png old mode 100755 new mode 100644 index a9c04271..8f2bc553 Binary files a/web/image/invisible.png and b/web/image/invisible.png differ diff --git a/web/image/store.png b/web/image/store.png old mode 100755 new mode 100644 index 58ee07da..82494548 Binary files a/web/image/store.png and b/web/image/store.png differ diff --git a/web/image/update-browser.png b/web/image/update-browser.png old mode 100755 new mode 100644 index eac667a4..7be69691 Binary files a/web/image/update-browser.png and b/web/image/update-browser.png differ diff --git a/web/js/db/calc-sum.js b/web/js/db/calc-sum.js old mode 100755 new mode 100644 diff --git a/web/js/db/calc.js b/web/js/db/calc.js old mode 100755 new mode 100644 diff --git a/web/js/db/conn.js b/web/js/db/conn.js old mode 100755 new mode 100644 diff --git a/web/js/db/db.js b/web/js/db/db.js old mode 100755 new mode 100644 diff --git a/web/js/db/form.js b/web/js/db/form.js old mode 100755 new mode 100644 diff --git a/web/js/db/iterator.js b/web/js/db/iterator.js old mode 100755 new mode 100644 diff --git a/web/js/db/main.js b/web/js/db/main.js old mode 100755 new mode 100644 diff --git a/web/js/db/model.js b/web/js/db/model.js old mode 100755 new mode 100644 diff --git a/web/js/db/param.js b/web/js/db/param.js old mode 100755 new mode 100644 diff --git a/web/js/db/result-set.js b/web/js/db/result-set.js old mode 100755 new mode 100644 diff --git a/web/js/db/result.js b/web/js/db/result.js old mode 100755 new mode 100644 diff --git a/web/js/hedera/form.js b/web/js/hedera/form.js old mode 100755 new mode 100644 diff --git a/web/js/hedera/gui.css b/web/js/hedera/gui.css old mode 100755 new mode 100644 diff --git a/web/js/hedera/gui.js b/web/js/hedera/gui.js old mode 100755 new mode 100644 diff --git a/web/js/hedera/login.css b/web/js/hedera/login.css old mode 100755 new mode 100644 diff --git a/web/js/hedera/login.js b/web/js/hedera/login.js old mode 100755 new mode 100644 diff --git a/web/js/hedera/main.php b/web/js/hedera/main.php deleted file mode 100755 index d8e3706a..00000000 --- a/web/js/hedera/main.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/web/js/hedera/module.js b/web/js/hedera/module.js old mode 100755 new mode 100644 diff --git a/web/js/hedera/opensans.ttf b/web/js/hedera/opensans.ttf deleted file mode 100755 index db433349..00000000 Binary files a/web/js/hedera/opensans.ttf and /dev/null differ diff --git a/web/js/hedera/report.css b/web/js/hedera/report.css old mode 100755 new mode 100644 index 1d4bf275..e2cbfd99 --- a/web/js/hedera/report.css +++ b/web/js/hedera/report.css @@ -1,13 +1,8 @@ @font-face { -<<<<<<< HEAD - font-family: 'Open Sans'; - src: url('opensans.ttf') format('truetype'); -======= font-family: 'Roboto'; src: url('roboto.ttf') format('truetype'); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } @media print { @@ -20,11 +15,7 @@ width: 100%; page-break-after: always; } -<<<<<<< HEAD - .print-button -======= #topbar ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb { display: none; } @@ -34,10 +25,7 @@ body { background-color: #EEE; -<<<<<<< HEAD -======= padding-top: 3.9em; ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } .sheet { @@ -48,25 +36,6 @@ box-shadow: 0 1mm 1mm #CCC; padding: 20mm; } -<<<<<<< HEAD - .print-button - { - position: fixed; - top: 6mm; - right: 6mm; - border-radius: 2px; - background-color: #009688; - color: white; - padding: 2mm; - z-index: 100; - border: none; - cursor: pointer; - box-shadow: 0 1mm 1mm #AAA; - } - .print-button:hover - { - background-color: #00796B; -======= #topbar { position: fixed; @@ -94,16 +63,11 @@ #topbar > button:hover { background-color: rgba(1, 1, 1, 0.2); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } } * { -<<<<<<< HEAD - font-family: 'Open Sans'; -======= font-family: 'Roboto'; ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } body { @@ -120,8 +84,6 @@ body /* page-break-after: always;*/ } -<<<<<<< HEAD -======= /* Widgets */ .htk-grid @@ -156,4 +118,3 @@ body } ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb diff --git a/web/js/hedera/report.html b/web/js/hedera/report.html index fc369a8f..908c81fd 100755 --- a/web/js/hedera/report.html +++ b/web/js/hedera/report.html @@ -10,13 +10,9 @@ Report -<<<<<<< HEAD - -=======
->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb diff --git a/web/js/hedera/report.js b/web/js/hedera/report.js old mode 100755 new mode 100644 index 64244e3d..e3a29b5b --- a/web/js/hedera/report.js +++ b/web/js/hedera/report.js @@ -3,9 +3,6 @@ Vn.Report = new Class ({ Extends: Vn.Object -<<<<<<< HEAD - ,open: function () {} -======= ,initialize: function (moduleInfo, gui) { this.info = moduleInfo; @@ -33,7 +30,6 @@ Vn.Report = new Class this.batch = batch; this.createWindow (); } ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,print: function () { @@ -56,12 +52,6 @@ Vn.Report = new Class head.appendChild (link); } -<<<<<<< HEAD - ,createWindow: function (reportPath) - { - var reportWindow = window.open (''/*'js/hedera/report.html'*/, '_blank'/*reportPath*/, - 'resizable=yes,height=900,width=900,scrollbars=yes,menubar=true'); -======= ,createWindow: function () { var reportWindow = window.open ( @@ -69,30 +59,11 @@ Vn.Report = new Class 'height=650, width=950, resizable=yes, fullscreen=no,'+ 'titlebar=no, menubar=no, toolbar=no, location=no, scrollbars=yes' ); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb if (!reportWindow) { Htk.Toast.showError ( _('Please unlock popups and try again')); -<<<<<<< HEAD - return null; - } - - this.window = reportWindow; - this.doc = reportWindow.document - - this.includeCss ('js/hedera/report.css'); - this.includeCss ('reports/'+ reportPath +'/style.css'); - - var printButton = this.doc.createElement ('button'); - printButton.className = 'print-button'; - printButton.appendChild (this.doc.createTextNode (_('Print'))); - printButton.addEventListener ('click', this.print.bind (this)); - this.doc.body.appendChild (printButton); - - return reportWindow; -======= return false; } @@ -127,7 +98,6 @@ Vn.Report = new Class res.link (); this.doc.body.appendChild (res.$('report')); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } }); diff --git a/web/js/hedera/style.css b/web/js/hedera/style.css old mode 100755 new mode 100644 diff --git a/web/js/hedera/tpv.js b/web/js/hedera/tpv.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column.js b/web/js/htk/column.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/button.js b/web/js/htk/column/button.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/check.js b/web/js/htk/column/check.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/date.js b/web/js/htk/column/date.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/image.js b/web/js/htk/column/image.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/link.js b/web/js/htk/column/link.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/radio.js b/web/js/htk/column/radio.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/spin.js b/web/js/htk/column/spin.js old mode 100755 new mode 100644 diff --git a/web/js/htk/column/text.js b/web/js/htk/column/text.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field.js b/web/js/htk/field.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/button.js b/web/js/htk/field/button.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/calendar.js b/web/js/htk/field/calendar.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/check.js b/web/js/htk/field/check.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/date-chooser.js b/web/js/htk/field/date-chooser.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/entry.js b/web/js/htk/field/entry.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/html.js b/web/js/htk/field/html.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/image.js b/web/js/htk/field/image.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/label.js b/web/js/htk/field/label.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/radio-group.js b/web/js/htk/field/radio-group.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/radio.js b/web/js/htk/field/radio.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/search-entry.js b/web/js/htk/field/search-entry.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/select.js b/web/js/htk/field/select.js old mode 100755 new mode 100644 index 2ff6491a..95c27738 --- a/web/js/htk/field/select.js +++ b/web/js/htk/field/select.js @@ -192,16 +192,11 @@ Htk.Select = new Class else value = null; -<<<<<<< HEAD - this.setRow (row); - this.valueChanged (value); -======= this._setRow (row); this.valueChanged (value); this._popup.hide (); e.stopPropagation (); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } ,_onPopupClose: function () @@ -236,29 +231,8 @@ Htk.Select = new Class if (model && model.ready) { -<<<<<<< HEAD - case Db.Model.Status.READY: - { - var data = model.data; - this.addOption (null, ''); - - for (var i = 0; i < data.length; i++) - this.addOption (data[i][this.showColumnIndex], data[i][1]); - - this.selectOption (); - this.signalEmit ('ready'); - break; - } - case Db.Model.Status.ERROR: - this.addOption (null, _('Error')); - case Db.Model.Status.LOADING: - this.addOption (null, _('Loading...')); - default: - this.setRow (-1); -======= this._selectOption (); this.signalEmit ('ready'); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } else this._setRow (-1); diff --git a/web/js/htk/field/spin.js b/web/js/htk/field/spin.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/table.js b/web/js/htk/field/table.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/text-area.js b/web/js/htk/field/text-area.js old mode 100755 new mode 100644 diff --git a/web/js/htk/field/text.js b/web/js/htk/field/text.js old mode 100755 new mode 100644 diff --git a/web/js/htk/full-image.js b/web/js/htk/full-image.js old mode 100755 new mode 100644 diff --git a/web/js/htk/grid.js b/web/js/htk/grid.js old mode 100755 new mode 100644 diff --git a/web/js/htk/htk.js b/web/js/htk/htk.js old mode 100755 new mode 100644 diff --git a/web/js/htk/image-editor.js b/web/js/htk/image-editor.js old mode 100755 new mode 100644 index 3ac9d948..5f31a6bd --- a/web/js/htk/image-editor.js +++ b/web/js/htk/image-editor.js @@ -17,11 +17,8 @@ Htk.ImageEditor = new Class this.$('max-size').value = 10 /* MB */ * 1048576; this.$('form').action = '//'+ Vn.Config['image_host'] +'/rest.php?action=image'; -<<<<<<< HEAD -======= this.parent (props); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } ,onNameChange: function () diff --git a/web/js/htk/main.js b/web/js/htk/main.js old mode 100755 new mode 100644 diff --git a/web/js/htk/popup.js b/web/js/htk/popup.js old mode 100755 new mode 100644 diff --git a/web/js/htk/repeater.js b/web/js/htk/repeater.js old mode 100755 new mode 100644 diff --git a/web/js/htk/spinner.js b/web/js/htk/spinner.js old mode 100755 new mode 100644 diff --git a/web/js/htk/style.css b/web/js/htk/style.css old mode 100755 new mode 100644 diff --git a/web/js/htk/toast.js b/web/js/htk/toast.js old mode 100755 new mode 100644 diff --git a/web/js/htk/widget.js b/web/js/htk/widget.js old mode 100755 new mode 100644 diff --git a/web/js/misc/main.js b/web/js/misc/main.js old mode 100755 new mode 100644 diff --git a/web/js/misc/mootools.js b/web/js/misc/mootools.js old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-cool.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-cool.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-cry.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-cry.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-embarassed.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-embarassed.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-frown.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-frown.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-innocent.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-innocent.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-kiss.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-kiss.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-laughing.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-laughing.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-money-mouth.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-money-mouth.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-sealed.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-sealed.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-smile.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-smile.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-surprised.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-surprised.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-tongue-out.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-tongue-out.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-undecided.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-undecided.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-wink.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-wink.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/emoticons/img/smiley-yell.gif b/web/js/misc/tinymce/plugins/emoticons/img/smiley-yell.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/plugins/visualblocks/css/visualblocks.css b/web/js/misc/tinymce/plugins/visualblocks/css/visualblocks.css old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/content.inline.min.css b/web/js/misc/tinymce/skins/lightgray/content.inline.min.css old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/content.min.css b/web/js/misc/tinymce/skins/lightgray/content.min.css old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/img/anchor.gif b/web/js/misc/tinymce/skins/lightgray/img/anchor.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/img/loader.gif b/web/js/misc/tinymce/skins/lightgray/img/loader.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/img/object.gif b/web/js/misc/tinymce/skins/lightgray/img/object.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/img/trans.gif b/web/js/misc/tinymce/skins/lightgray/img/trans.gif old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/skin.ie7.min.css b/web/js/misc/tinymce/skins/lightgray/skin.ie7.min.css old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/skins/lightgray/skin.min.css b/web/js/misc/tinymce/skins/lightgray/skin.min.css old mode 100755 new mode 100644 diff --git a/web/js/misc/tinymce/tinymce.min.js b/web/js/misc/tinymce/tinymce.min.js old mode 100755 new mode 100644 diff --git a/web/js/sql/batch.js b/web/js/sql/batch.js old mode 100755 new mode 100644 diff --git a/web/js/sql/delete.js b/web/js/sql/delete.js old mode 100755 new mode 100644 diff --git a/web/js/sql/dml.js b/web/js/sql/dml.js old mode 100755 new mode 100644 diff --git a/web/js/sql/expr.js b/web/js/sql/expr.js old mode 100755 new mode 100644 diff --git a/web/js/sql/field.js b/web/js/sql/field.js old mode 100755 new mode 100644 diff --git a/web/js/sql/filter-item.js b/web/js/sql/filter-item.js old mode 100755 new mode 100644 diff --git a/web/js/sql/filter.js b/web/js/sql/filter.js old mode 100755 new mode 100644 diff --git a/web/js/sql/function.js b/web/js/sql/function.js old mode 100755 new mode 100644 diff --git a/web/js/sql/holder.js b/web/js/sql/holder.js old mode 100755 new mode 100644 diff --git a/web/js/sql/insert.js b/web/js/sql/insert.js old mode 100755 new mode 100644 diff --git a/web/js/sql/list.js b/web/js/sql/list.js old mode 100755 new mode 100644 diff --git a/web/js/sql/main.js b/web/js/sql/main.js old mode 100755 new mode 100644 diff --git a/web/js/sql/multi-stmt.js b/web/js/sql/multi-stmt.js old mode 100755 new mode 100644 diff --git a/web/js/sql/object.js b/web/js/sql/object.js old mode 100755 new mode 100644 diff --git a/web/js/sql/operation.js b/web/js/sql/operation.js old mode 100755 new mode 100644 diff --git a/web/js/sql/search-tags.js b/web/js/sql/search-tags.js old mode 100755 new mode 100644 diff --git a/web/js/sql/select.js b/web/js/sql/select.js old mode 100755 new mode 100644 diff --git a/web/js/sql/sql.js b/web/js/sql/sql.js old mode 100755 new mode 100644 diff --git a/web/js/sql/stmt.js b/web/js/sql/stmt.js old mode 100755 new mode 100644 diff --git a/web/js/sql/string.js b/web/js/sql/string.js old mode 100755 new mode 100644 diff --git a/web/js/sql/table.js b/web/js/sql/table.js old mode 100755 new mode 100644 diff --git a/web/js/sql/target.js b/web/js/sql/target.js old mode 100755 new mode 100644 diff --git a/web/js/sql/update.js b/web/js/sql/update.js old mode 100755 new mode 100644 diff --git a/web/js/sql/value.js b/web/js/sql/value.js old mode 100755 new mode 100644 diff --git a/web/js/vn/browser.js b/web/js/vn/browser.js old mode 100755 new mode 100644 diff --git a/web/js/vn/builder.js b/web/js/vn/builder.js old mode 100755 new mode 100644 diff --git a/web/js/vn/cookie.js b/web/js/vn/cookie.js old mode 100755 new mode 100644 diff --git a/web/js/vn/date.js b/web/js/vn/date.js old mode 100755 new mode 100644 diff --git a/web/js/vn/error.js b/web/js/vn/error.js old mode 100755 new mode 100644 diff --git a/web/js/vn/hash-listener.js b/web/js/vn/hash-listener.js old mode 100755 new mode 100644 diff --git a/web/js/vn/hash-param.js b/web/js/vn/hash-param.js old mode 100755 new mode 100644 diff --git a/web/js/vn/hash.js b/web/js/vn/hash.js old mode 100755 new mode 100644 diff --git a/web/js/vn/http-request.js b/web/js/vn/http-request.js old mode 100755 new mode 100644 diff --git a/web/js/vn/ie.js b/web/js/vn/ie.js old mode 100755 new mode 100644 diff --git a/web/js/vn/locale.js b/web/js/vn/locale.js old mode 100755 new mode 100644 diff --git a/web/js/vn/main.js b/web/js/vn/main.js index 58bebc0a..0a650f28 100644 --- a/web/js/vn/main.js +++ b/web/js/vn/main.js @@ -1,191 +1,4 @@ -<<<<<<< HEAD - ,getVersion: function () - { - if (this._version === undefined) - { - var re = /[; ]hedera_version=([^\\s;]*)/; - var sMatch = (' '+ document.cookie).match (re); - this._version = (sMatch) ? '?'+ unescape (sMatch[1]) : ''; - } - - return this._version; - } - - /** - * Includes a new CSS stylesheet in the current document, if the stylesheet - * its already included, does nothing. - * - * @param {string} fileName The stylesheet file name - **/ - ,includeCss: function (fileName) - { - var cssData = this.cssIncludes[fileName]; - - if (!cssData) - { - var link = document.createElement ('link'); - link.rel = 'stylesheet'; - link.type = 'text/css'; - link.href = fileName +'?'+ Vn.Cookie.get ('hedera_version'); - this.head.appendChild (link); - - this.cssIncludes[fileName] = - { - included: true - ,link: link - }; - } - else if (!cssData.included) - { - cssData.link.disabled = false; - cssData.included = true; - } - } - - /** - * Excludes a CSS stylesheet from the current document. - * - * @param {string} fileName The stylesheet file name - **/ - ,excludeCss: function (fileName) - { - var cssData = this.cssIncludes[fileName]; - - if (cssData && cssData.included) - { - cssData.link.disabled = true; - cssData.included = false; - } - } - - /** - * Includes a new Javascript in the current document, if the script - * its already included, does nothing. - * - * @param {string} fileName The script file name - * @param {Function} callback The function to call when script is - * downloaded and included - **/ - ,includeJs: function (fileName, callback, skipVersion) - { - var includeData = this.jsIncludes[fileName]; - - if (includeData === undefined) - { - var src = fileName; - - if (!skipVersion) - src = src +'?'+ Vn.Cookie.get ('hedera_version'); - - var script = document.createElement ('script'); - script.type = 'text/javascript'; - script.src = src; - - includeData = { - script: script - ,callbacks: [] - ,loaded: false - }; - - if (callback) - includeData.callbacks.push (callback); - - script.onload = - this.jsLoaded.bind (this, includeData, true); - script.onerror = - this.jsLoaded.bind (this, includeData, false); - script.onreadystatechange = - this.jsStateChanged.bind (this, includeData); - - this.jsIncludes[fileName] = includeData; - - this.head.appendChild (script); - } - else if (callback) - { - if (includeData.loaded) - callback (); - else - includeData.callbacks.push (callback); - } - } - - ,jsStateChanged: function (includeData) - { - console.log ('js: '+ includeData.script.readyState); - - if (includeData.script.readyState == 'complete') - this.jsLoaded (includeData, true); - } - - ,jsLoaded: function (includeData, success) - { - if (includeData.loaded) - return; - - for (var i = 0; i < includeData.callbacks.length; i++) - includeData.callbacks[i] (success); - - includeData.loaded = true; - includeData.callbacks = null; - } - - ,loadXml: function (path, callback) - { - var includeData = this.xmlIncludes[path]; - - if (!includeData) - { - var request = new XMLHttpRequest (); - request.onreadystatechange = - this.onXmlReady.bind (this, request, path, callback); - request.open ('get', path +'?'+ Vn.Cookie.get ('hedera_version'), true); - request.send (); - } - else if (callback) - callback (true); - } - - ,onXmlReady: function (request, path, callback) - { - if (request.readyState != 4) - return; - - if (request.status == 200) - this.xmlIncludes[path] = request.responseXML; - - if (callback) - callback (request.status == 200); - } - - ,getXml: function (path) - { - return this.xmlIncludes[path]; - } - - /** - * Checks if user is using a mobile browser. - * - * return {boolean} %true if is mobile, %false otherwise. - **/ - ,isMobile: function () - { - if (this.isMobileCached === null) - { - var regExp = /(Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone)/i; - this.isMobileCached = navigator.userAgent.match (regExp); - } - - return this.isMobileCached; - } - - ,get: function (id) - { - return document.getElementById (id); - } -}; -======= Vn.include ('js/misc/main'); Vn.includeLib ('vn', [ @@ -205,5 +18,4 @@ Vn.includeLib ('vn', ,'builder' ,'http-request' ]); ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb diff --git a/web/js/vn/mutators.js b/web/js/vn/mutators.js old mode 100755 new mode 100644 diff --git a/web/js/vn/node.js b/web/js/vn/node.js old mode 100755 new mode 100644 diff --git a/web/js/vn/object.js b/web/js/vn/object.js old mode 100755 new mode 100644 diff --git a/web/js/vn/param.js b/web/js/vn/param.js old mode 100755 new mode 100644 diff --git a/web/js/vn/url.js b/web/js/vn/url.js old mode 100755 new mode 100644 diff --git a/web/js/vn/value.js b/web/js/vn/value.js old mode 100755 new mode 100644 diff --git a/web/js/vn/vn.js b/web/js/vn/vn.js old mode 100755 new mode 100644 diff --git a/web/locale/ca/forms/ecomerce/catalog.json b/web/locale/ca/forms/ecomerce/catalog.json index 7596224e..a39efd6d 100755 --- a/web/locale/ca/forms/ecomerce/catalog.json +++ b/web/locale/ca/forms/ecomerce/catalog.json @@ -13,24 +13,7 @@ ,"Switch view": "Canviar vista" ,"StartOrder": "Començar comanda" ,"ShoppingBasket": "Cistella de la compra" - - ,"StartOrder": "Començar encàrrec" - ,"Basket": "Cistella" - ,"Shopping basket": "Cistella de la compra" - ,"Configure": "Configurar" - ,"Configure shopping basket": "Configurar cistella de la compra" - ,"Date": "Data" - ,"%A, %e of %B": "%A, %e de %B" - ,"Delivery": "Lliurament" - ,"Warehouse": "Magatzem" - ,"Agency": "Agència" -<<<<<<< HEAD - ,"Realm": "Família" - ,"Subtype": "Subtipus" - ,"Search:": "Cercar:" - ,"GeneralSearch": "Cerca general" -======= ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agència" ,"Warehouse": "Magatzem" @@ -49,7 +32,6 @@ ,"Origin": "Origen" ,"Category": "Categoria" ,"Remove filters": "Esborrar filtres" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Price": "Precio" ,"Amount": "Quantitat" diff --git a/web/locale/ca/forms/ecomerce/checkout.json b/web/locale/ca/forms/ecomerce/checkout.json index 991a1816..0b70dc20 100755 --- a/web/locale/ca/forms/ecomerce/checkout.json +++ b/web/locale/ca/forms/ecomerce/checkout.json @@ -26,6 +26,6 @@ ,"OrderStarted": "Comanda començada" ,"OrderUpdated": "Comanda actualitzada" - ,"NoAgeciesAvailableForDate": "No hi ha agències disponibles per a la data i el consignatari seleccionats, modifica la data de recepció de la comanda" + ,"NoAgeciesAvailableForDate": "No hi ha agències disponibles per a la data i el consignatari seleccionats, modifica la data d'enviament de la comanda" ,"NoWarehousesAvailableForDate": "No hi ha magatzems disponibles per a la data seleccionada, modifica la data de recollida de la comanda" } diff --git a/web/locale/ca/js/db.js b/web/locale/ca/js/db.js old mode 100755 new mode 100644 diff --git a/web/locale/ca/js/hedera.js b/web/locale/ca/js/hedera.js old mode 100755 new mode 100644 diff --git a/web/locale/ca/js/htk.js b/web/locale/ca/js/htk.js old mode 100755 new mode 100644 diff --git a/web/locale/ca/js/vn.js b/web/locale/ca/js/vn.js old mode 100755 new mode 100644 index fdba2cf9..63e37521 --- a/web/locale/ca/js/vn.js +++ b/web/locale/ca/js/vn.js @@ -41,54 +41,6 @@ Vn.Locale.add ,"Oct": "Oct" ,"Nov": "Nov" ,"Dec": "Des" -<<<<<<< HEAD - - ,"AppName": "Verdnatura" - ,"Beta": "Beta" - ,"User": "Usuari" - ,"Password": "Contrasenya" - ,"Remember": "Recordar" - ,"Enter": "Entrar" - ,"Exit": "Sortir" - ,"ErrorLoadingForm": "Error al carregar formulari" - ,"YoureVisitor": "Solament estàs de visita?" - ,"NewVersionAvailable": "Hi ha una nova actualització, la pàgina recargargará automàticament per descarregar-la" - ,"ChangeLog": "Canvis recents" - ,"CookiesNotification": "En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització de continguts i anàlisi." - ,"ReturnToOldWebsite": "Web antiga" - ,"TestTheNewWebsite": "Prova la nova web!" - - ,"Print": "Imprimir" - ,"Please unlock popups and try again": - "Si us plau, desbloqueja els popups i torna-ho a intentar" - - ,"Menu": "Menú" - - ,"Home": "Inici" - ,"Orders": "Encàrrecs" - ,"Basket": "Cistella" - ,"Last orders": "Últims comandes" - ,"Invoices": "Factures" - ,"Catalog": "Catàleg" - ,"About": "Coneix-nos" - ,"About us": "Quant a" - ,"Why": "Per què?" - ,"Location": "Localització" - ,"Administration": "Administració" - ,"Control panel": "Panell de control" - ,"Users": "Usuaris" - ,"Visits": "Visites" - ,"News": "Noticies" - ,"Photos": "Fotos" - ,"Shelves": "Estanteríes" - ,"Contact": "Vull ser client" - ,"Training": "Formació" - ,"Agencies": "Agències" - ,"Configuration": "Configuració" - ,"Account": "Compte" - ,"Addresses": "Direccions" -======= ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"%A, %B %e": "%A, %e de %B" }); diff --git a/web/locale/en/js/db.js b/web/locale/en/js/db.js old mode 100755 new mode 100644 diff --git a/web/locale/en/js/hedera.js b/web/locale/en/js/hedera.js old mode 100755 new mode 100644 diff --git a/web/locale/en/js/htk.js b/web/locale/en/js/htk.js old mode 100755 new mode 100644 diff --git a/web/locale/en/js/vn.js b/web/locale/en/js/vn.js old mode 100755 new mode 100644 diff --git a/web/locale/es/forms/ecomerce/catalog.json b/web/locale/es/forms/ecomerce/catalog.json index a45ec641..f6169903 100755 --- a/web/locale/es/forms/ecomerce/catalog.json +++ b/web/locale/es/forms/ecomerce/catalog.json @@ -12,22 +12,8 @@ ,"Grid view": "Vista de rejilla" ,"Switch view": "Cambiar vista" ,"StartOrder": "Empezar pedido" - ,"Basket": "Cesta" - ,"Shopping basket": "Cesta de la compra" - ,"Configure": "Configurar" - ,"Configure shopping basket": "Configurar cesta de la compra" - ,"Date": "Fecha" - ,"%A, %e of %B": "%A, %e de %B" - ,"Delivery": "Entrega" - ,"Warehouse": "Almacén" - ,"Agency": "Agencia" + ,"ShoppingBasket": "Cesta de la compra" -<<<<<<< HEAD - ,"Realm": "Familia" - ,"Subtype": "Subtipo" - ,"Search:": "Buscar:" - ,"GeneralSearch": "Búsqueda general" -======= ,"%A, %e of %B": "%A, %e de %B" ,"Agency": "Agencia" ,"Warehouse": "Almacén" @@ -46,7 +32,6 @@ ,"Origin": "Origen" ,"Category": "Categoría" ,"Remove filters": "Quitar filtros" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Price": "Precio" ,"Amount": "Cantidad" diff --git a/web/locale/es/forms/ecomerce/checkout.json b/web/locale/es/forms/ecomerce/checkout.json index 082e3d6b..af1c34b0 100755 --- a/web/locale/es/forms/ecomerce/checkout.json +++ b/web/locale/es/forms/ecomerce/checkout.json @@ -26,6 +26,6 @@ ,"OrderStarted": "Pedido empezado" ,"OrderUpdated": "Pedido actualizado" - ,"NoAgeciesAvailableForDate": "No hay agencias disponibles para la fecha y el consignatario seleccionados, modifica la fecha de recepción del pedido" + ,"NoAgeciesAvailableForDate": "No hay agencias disponibles para la fecha y el consignatario seleccionados, modifica la fecha de envío del pedido" ,"NoWarehousesAvailableForDate": "No hay almacenes disponibles para la fecha seleccionada, modifica la fecha de recogida del pedido" } diff --git a/web/locale/es/js/db.js b/web/locale/es/js/db.js old mode 100755 new mode 100644 diff --git a/web/locale/es/js/hedera.js b/web/locale/es/js/hedera.js old mode 100755 new mode 100644 diff --git a/web/locale/es/js/htk.js b/web/locale/es/js/htk.js old mode 100755 new mode 100644 diff --git a/web/locale/es/js/vn.js b/web/locale/es/js/vn.js old mode 100755 new mode 100644 index c4937c0a..b1b86f0a --- a/web/locale/es/js/vn.js +++ b/web/locale/es/js/vn.js @@ -41,54 +41,6 @@ Vn.Locale.add ,"Oct": "Oct" ,"Nov": "Nov" ,"Dec": "Dic" -<<<<<<< HEAD - - ,"AppName": "Verdnatura" - ,"Beta": "Beta" - ,"User": "Usuario" - ,"Password": "Contraseña" - ,"Remember": "Recordar" - ,"Enter": "Entrar" - ,"Exit": "Salir" - ,"ErrorLoadingForm": "Error al cargar formulario" - ,"YoureVisitor": "¿Solo estás de visita?" - ,"NewVersionAvailable": "Hay una nueva actualización, la página se recargargará automaticamente para descargarla" - ,"ChangeLog": "Cambios recientes" - ,"CookiesNotification": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis." - ,"ReturnToOldWebsite": "Web antigua" - ,"TestTheNewWebsite": "¡Prueba la nueva web!" - - ,"Print": "Imprimir" - ,"Please unlock popups and try again": - "Por favor, desploquea los popups y vuélvelo a intentar" - - ,"Menu": "Menú" - - ,"Home": "Inicio" - ,"Orders": "Pedidos" - ,"Basket": "Cesta" - ,"Last orders": "Últimos pedidos" - ,"Invoices": "Facturas" - ,"Catalog": "Catálogo" - ,"About": "Conócenos" - ,"About us": "Sobre nosotros" - ,"Why": "¿Por qué?" - ,"Location": "Localización" - ,"Administration": "Administración" - ,"Control panel": "Panel de control" - ,"Users": "Usuarios" - ,"Visits": "Visitas" - ,"News": "Noticias" - ,"Photos": "Fotos" - ,"Shelves": "Estanterías" - ,"Contact": "Quiero ser cliente" - ,"Training": "Formación" - ,"Agencies": "Agencias" - ,"Configuration": "Configuración" - ,"Account": "Cuenta" - ,"Addresses": "Direcciones" -======= ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"%A, %B %e": "%A, %e de %B" }); diff --git a/web/locale/fr/forms/ecomerce/catalog.json b/web/locale/fr/forms/ecomerce/catalog.json index 09747a33..587ff699 100755 --- a/web/locale/fr/forms/ecomerce/catalog.json +++ b/web/locale/fr/forms/ecomerce/catalog.json @@ -3,23 +3,6 @@ ,"SearchResults": "Résultats de la recherche" ,"SelectFamily": "Choisissez une famille" -<<<<<<< HEAD - ,"SelectSubtype": "Sélectionnez le sous-menu sur la droite" - ,"ArticleNotFound": "Article pas trouvé" - ,"ArticleNotAvailable": "Article pas disponible" - - ,"StartOrder": "Acheter" - ,"Basket": "Panier" - ,"Shopping basket": "Mon panier" - ,"Configure": "Configurar" - ,"Configure shopping basket": "Configurez panier" - ,"Date": "Date" - ,"%A, %e of %B": "%A, %e de %B" - ,"Delivery": "Accouchement" - ,"Warehouse": "Entrepôt" - ,"Agency": "Agence" - -======= ,"Choose filter from right menu": "Choisissez un filtre dans le menu de droite" ,"Choose a realm": "Choisissez un royaume" ,"ArticleNotFound": "Article non trouvé" @@ -28,7 +11,6 @@ ,"List view": "Liste voir" ,"Grid view": "Grille voir" ,"Switch view": "Changer vue" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"StartOrder": "Acheter" ,"ShoppingBasket": "Mon panier" diff --git a/web/locale/fr/forms/ecomerce/checkout.json b/web/locale/fr/forms/ecomerce/checkout.json index 03cab275..429aca89 100755 --- a/web/locale/fr/forms/ecomerce/checkout.json +++ b/web/locale/fr/forms/ecomerce/checkout.json @@ -26,11 +26,6 @@ ,"OrderStarted": "Commande a commencé" ,"OrderUpdated": "Mise à jour commande" -<<<<<<< HEAD - ,"NoAgeciesAvailableForDate": "Aucun agences disponibles pour la date et le destinataire sélectionné, changer la date de réception de l'ordre" - ,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de la collecte de l'ordre" -======= ,"NoAgeciesAvailableForDate": "Aucune agence disponibles pour la date et le destinataire sélectionné, changer la date d'envoi de la commande" ,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de retrait" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } diff --git a/web/locale/fr/js/db.js b/web/locale/fr/js/db.js old mode 100755 new mode 100644 diff --git a/web/locale/fr/js/hedera.js b/web/locale/fr/js/hedera.js old mode 100755 new mode 100644 diff --git a/web/locale/fr/js/htk.js b/web/locale/fr/js/htk.js old mode 100755 new mode 100644 diff --git a/web/locale/fr/js/vn.js b/web/locale/fr/js/vn.js old mode 100755 new mode 100644 index 54bb20ee..4ad0530c --- a/web/locale/fr/js/vn.js +++ b/web/locale/fr/js/vn.js @@ -41,54 +41,6 @@ Vn.Locale.add ,"Oct": "Oct" ,"Nov": "Nov" ,"Dec": "Déc" -<<<<<<< HEAD - - ,"AppName": "Verdnatura" - ,"Beta": "Beta" - ,"User": "Utilisateur" - ,"Password": "Mot de passe" - ,"Remember": "Rappeler" - ,"Enter": "entrer" - ,"Exit": "Laisser" - ,"ErrorLoadingForm": "Forme erreur de chargement" - ,"YoureVisitor": "¿Solo estás de visita?" - ,"NewVersionAvailable": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger" - ,"ChangeLog": "Modifications récentes" - ,"CookiesNotification": "En utilisant ce site, vous acceptez l'utilisation de cookies pour personnaliser le contenu et l'analyse." - ,"ReturnToOldWebsite": "Ancien site web" - ,"TestTheNewWebsite": "Testez le nouveau site!" - ,"Print": "Print" - - ,"Menu": "Menu" - - ,"Home": "Accueil" - ,"Orders": "Commandes" - ,"Basket": "Panier" - ,"Last orders": "Dernières commandes" - ,"Invoices": "Facturas" - ,"Catalog": "Catalogue" - ,"About": "Nous" - ,"About us": "A propos de nous" - ,"Why": "Pourquoi?" - ,"Location": "Emplacement" - ,"Administration": "Administration" - ,"Control panel": "Panneau de contrôle" - ,"Users": "Utilisateurs" - ,"Visits": "Visites" - ,"News": "Nouvelles" - ,"Photos": "Photos" - ,"Shelves": "Shelves" - ,"Contact": "Je veux être client" - ,"Training": "Formation" - ,"Agencies": "Agences" - ,"Configuration": "Configuration" - ,"Account": "Compte" - ,"Addresses": "Adresses" - - ,"SessionExpired": "Il a eu le temps de trop paresseux et votre session a expiré." - ,"InvalidLogin": "Utilisateur ou mot de passe incorrect. N'oubliez pas de distinction entre majuscules et minuscules." -======= ,"%A, %B %e": "%A, %B %e" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb }); diff --git a/web/locale/mn/js/db.js b/web/locale/mn/js/db.js old mode 100755 new mode 100644 diff --git a/web/locale/mn/js/hedera.js b/web/locale/mn/js/hedera.js old mode 100755 new mode 100644 diff --git a/web/locale/mn/js/htk.js b/web/locale/mn/js/htk.js old mode 100755 new mode 100644 diff --git a/web/locale/mn/js/vn.js b/web/locale/mn/js/vn.js old mode 100755 new mode 100644 diff --git a/web/locale/pt/forms/admin/visits.json b/web/locale/pt/forms/admin/visits.json old mode 100644 new mode 100755 index 518f9745..147fba11 --- a/web/locale/pt/forms/admin/visits.json +++ b/web/locale/pt/forms/admin/visits.json @@ -1,35 +1,4 @@ { -<<<<<<< HEAD - "Visits": "Visitas" - ,"VisitsManagement": "Gestão de visitas" - - ,"ActiveSessions": "Usuarios conectados" - ,"VisitsQuery": "Consulta de visitas" - ,"Refresh": "Actualizar" - - ,"ActiveSessions:": "Usuarios conectados:" - ,"NewVisitsTotal:": "Novas visitas:" - - ,"SessionNumber": "Nº sessão" - ,"User": "Usuario" - ,"Login": "Hora de acceso" - ,"LastActivity": "Última atividade" - ,"SO": "Sistema Operativo" - ,"Version": "Versão" - ,"NewVisit": "Nova visita" - - ,"SelectDateInterval": "Selecciona un intérvalo de datas" - ,"FromDate:": "Desde o día:" - ,"ToDate:": "Até o día:" - ,"VisitsTotal:": "Total visitas:" - - ,"Browser": "Navegador" - ,"MinVersion": "Versão mínima" - ,"MaxVersion": "Versão máxima" - ,"LastVisit": "Última visita" - ,"NewVisits": "Novas visitas" - ,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T" -======= "Visits": "Visualizações" ,"Refresh": "Actualização" @@ -42,5 +11,4 @@ ,"visits": "Visualizações" ,"news": "novas" ,"%a, %e %b %Y at %T": "%a, %e %b %Y em %T" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } diff --git a/web/locale/pt/forms/cms/about.json b/web/locale/pt/forms/cms/about.json index 3f443c15..99e48c3d 100644 --- a/web/locale/pt/forms/cms/about.json +++ b/web/locale/pt/forms/cms/about.json @@ -17,11 +17,7 @@ ,"BuyersAndTraders": "9 compradores especializados e nossos 20 comerciais te asessorarão em tudo o que necessites." -<<<<<<< HEAD - ,"Training": "Verdnatura formação" -======= ,"Verdnatura training": "Verdnatura formação" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"GoodTraining": "Em Verdnatura sabemos que uma boa formação é imprescindível para o desenvolvimento ótimo de qualqer atividade, e como não, também a de florista." ,"SpecialTrainingPrices": "Para que o orçamento de uma escola não repercuta na qualidade da sua formação, colaboramos com uma política de preços especiais para todas aquelas escolas que solicitem realizar cursos em nossas instalações de Verdnatura Silla." diff --git a/web/locale/pt/forms/cms/home.json b/web/locale/pt/forms/cms/home.json index 296de2ff..b1a949e8 100644 --- a/web/locale/pt/forms/cms/home.json +++ b/web/locale/pt/forms/cms/home.json @@ -1,11 +1,7 @@ { -<<<<<<< HEAD - "Sent": "Enviado" -======= "Start order": "Comece uma ordem" ,"Sent": "Enviado" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Author": "Autor" ,"votes": "votos" ,"NoAnswerSelected": "Não seleccionou nenhuma resposta" diff --git a/web/locale/pt/forms/ecomerce/catalog.json b/web/locale/pt/forms/ecomerce/catalog.json index 245efcae..ab4574a0 100644 --- a/web/locale/pt/forms/ecomerce/catalog.json +++ b/web/locale/pt/forms/ecomerce/catalog.json @@ -3,12 +3,6 @@ ,"SearchResults": "Resultados de busca" ,"SelectFamily": "Seleccione uma família" -<<<<<<< HEAD - ,"Select filter from right menu": "Seleccione um filtro no menú da direita" - ,"ArticleNotFound": "Ítem não encontrado" - ,"ArticleNotAvailable": "Ítem não disponível" - -======= ,"Choose filter from right menu": "Escolha um filtro no menú da direita" ,"Choose a realm": "Escolha um reino" ,"ArticleNotFound": "Ítem não encontrado" @@ -16,15 +10,10 @@ ,"List view": "Ver como lista" ,"Grid view": "Vista em modo de grade" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Switch view": "Modificar vista" ,"StartOrder": "Iniciar pedido" ,"ShoppingBasket": "Cesta da compra" -<<<<<<< HEAD - ,"Search": "Buscar" - ,"Order by": "Organizar" -======= ,"%A, %e of %B": "%A, %e of %B" ,"Agency": "Agência" ,"Warehouse": "Armazém" @@ -34,7 +23,6 @@ ,"Search": "Buscar" ,"Change": "Modificar" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Available": "Disponível" ,"Size": "Medida" ,"Realm": "Reino" @@ -45,19 +33,6 @@ ,"Category": "Categoria" ,"Remove filters": "Eliminar filtros" -<<<<<<< HEAD - ,"Amount": "Qtde" - ,"Aval": "Disp" - ,"Name": "Nome" - ,"S1": "Med" - ,"S2": "S2" - ,"Stems": "Talos" - ,"Cat": "Cat" - ,"Pack": "Pack" - ,"Origin": "Orígem" - ,"Price": "Preço" - ,"%.0d Units": "%.0d Unidades " -======= ,"Price": "Preço" ,"Amount": "Quantidade" ,"Name": "Nome" @@ -67,7 +42,6 @@ ,"Lower size": "Tamanho menor" ,"Higher size": "Tamanho maior" ,", %.0d Units": ", %.0d Unidades" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"from": "desde" ,"from %.2d€": "desde %.2d€" diff --git a/web/locale/pt/forms/ecomerce/confirm.json b/web/locale/pt/forms/ecomerce/confirm.json index 034c9fda..f11c8c4c 100644 --- a/web/locale/pt/forms/ecomerce/confirm.json +++ b/web/locale/pt/forms/ecomerce/confirm.json @@ -1,29 +1,6 @@ { "Checkout": "Finalizar pedido" -<<<<<<< HEAD - ,"OrderSummary": "Resumo do pedido" - ,"Arrival": "Chegada" - ,"%A, %e of %B": "%A, %e de %B" - ,"Agency": "Agência" - ,"Warehouse": "Armazém" - - ,"DeliveryAddress": "Endereço de envío" - - ,"Import": "Importe" - ,"TaxBase": "Base tributável" - ,"VAT": "IVA" - ,"Total": "Total" - - ,"Cancel": "Cancelar" - ,"Modify": "Modificar" - ,"Confirm": "Confirmar" - - ,"OrderPlacedSuccessfully": "Seu pedido foi realizado com êxito" - ,"OrderReserved": "Seu pedido foi reservado mas parece que houve um problema com o pagamento. Contacte com seu comercial." - ,"Accept": "Aceitar" - ,"PayNow": "Pagar agora" -======= ,"Order summary": "Resumo do pedido" ,"Delivery at": "Entrega na" ,"Agency": "Agência" @@ -56,5 +33,4 @@ ,"Accept": "Aceitar" ,"You have exceeded your credit.": "Você ultrapassou o seu crédito, por favor, fazer o pagamento para que possamos preparar a sua ordem." ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } diff --git a/web/locale/pt/forms/ecomerce/orders.json b/web/locale/pt/forms/ecomerce/orders.json index f51818ce..65daa841 100644 --- a/web/locale/pt/forms/ecomerce/orders.json +++ b/web/locale/pt/forms/ecomerce/orders.json @@ -11,11 +11,7 @@ ,"LastOrders": "Últimos pedidos" ,"Balance:": "Saldo:" -<<<<<<< HEAD - ,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, apague a quantidade sugerida e introduza a quantidade que deseje." -======= ,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, clique no botão de pagamento, apague a quantidade sugerida e introduza a quantidade que deseje." ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"MakePayment": "Realizar pagamento" ,"Company": "Empresa" ,"Pending": "Pendente" @@ -24,10 +20,7 @@ ,"ShoppingBasket": "Cesta da compra" ,"SeeOrder": "Mostrar detalhe do pedido" -<<<<<<< HEAD -======= ,"Delivery": "Entrega" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"TicketNumber": "Nº ticket" ,"SentAddress": "Endereço de envío" ,"Consignee": "Consignatario" @@ -40,11 +33,7 @@ ,"AmountError": "A quantidade deve ser um número positivo e inferior ou igual ao importe pendiente" ,"PayError": "Erro ao realizar o pagamento" -<<<<<<< HEAD - ,"%A, %e of %B": "%A, %e de %B" -======= ,"An error has been in the payment": "Parece que não houve um erro no pagamento" ,"Retry": "Tentar novamente" ,"Accept": "Aceitar" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb } diff --git a/web/locale/pt/forms/ecomerce/ticket.json b/web/locale/pt/forms/ecomerce/ticket.json index acd4d1ae..a70e10cc 100644 --- a/web/locale/pt/forms/ecomerce/ticket.json +++ b/web/locale/pt/forms/ecomerce/ticket.json @@ -1,22 +1,6 @@ { "OrderDetail": "Detalhe do pedido" -<<<<<<< HEAD - ,"Print delivery note": "Imprimir guía de remessa" - - ,"TicketNumber:": "Nº ticket:" - ,"DateExit:": "Data de envío:" - ,"SendMethod:": "Forma de envío:" - ,"Notes:": "Notas:" - ,"TicketTotal:": "Total pedido:" - ,"(VATIncluded)": "(IVA incluído)" - - ,"PC": "Código postal" - ,"City": "Município" - ,"Province": "Distrito" - ,"Address": "Endereço" - ,"Consignee": "Consignatario" -======= ,"%A, %e of %B %Y": "%A, %e de %B %Y" ,"Print delivery note": "Imprimir guía de remessa" @@ -24,7 +8,6 @@ ,"Total": "Total" ,"Tax base": "Tributável" ,"VAT": "IVA" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"ItemNumber": "Nº artículo" ,"Amount": "Qtde" diff --git a/web/locale/pt/js/hedera.js b/web/locale/pt/js/hedera.js index 15a469b2..18b17f53 100644 --- a/web/locale/pt/js/hedera.js +++ b/web/locale/pt/js/hedera.js @@ -10,11 +10,7 @@ Vn.Locale.add ,"Login phone": "+34 963 242 100" ,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada" -<<<<<<< HEAD - ,"Invalid login": "Usuário ou Palavra-Passe incorreto. Lembre-se de diferenciar maiusculas e minusculas." -======= ,"Invalid login": "Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e minusculas" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"There was an internal error": "Houve um erro interno" ,"Menu": "Menú" @@ -47,17 +43,11 @@ Vn.Locale.add ,"Administration": "Administração" ,"Control panel": "Painel de controle" ,"Users": "Usuarios" -<<<<<<< HEAD - ,"Visits": "Visitas" - ,"News": "Noticias" - ,"Photos": "Fotos" -======= ,"Connections": "Conexões" ,"Visits": "Visitas" ,"News": "Noticias" ,"Photos": "Fotos" ,"Reports": "Relatórios" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb ,"Shelves": "Estantes" ,"Items list": "Lista de Itens" ,"Contact": "Quero ser cliente" diff --git a/web/locale/pt/js/vn.js b/web/locale/pt/js/vn.js index e2d3d5c6..eb2edcad 100644 --- a/web/locale/pt/js/vn.js +++ b/web/locale/pt/js/vn.js @@ -41,9 +41,6 @@ Vn.Locale.add ,"Oct": "Out" ,"Nov": "Nov" ,"Dec": "Dez" -<<<<<<< HEAD -======= ,"%A, %B %e": "%A, %B %e" ->>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb }); diff --git a/web/pages/main/main.js b/web/pages/main/main.js old mode 100755 new mode 100644 diff --git a/web/pages/main/style.css b/web/pages/main/style.css old mode 100755 new mode 100644 diff --git a/web/pages/tpv/style.css b/web/pages/tpv/style.css old mode 100755 new mode 100644 diff --git a/web/pages/update-browser/style.css b/web/pages/update-browser/style.css old mode 100755 new mode 100644 diff --git a/web/pages/version-menu/style.css b/web/pages/version-menu/style.css old mode 100755 new mode 100644 diff --git a/web/pages/web/head.php b/web/pages/web/head.php deleted file mode 100755 index d4782044..00000000 --- a/web/pages/web/head.php +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/web/pages/web/web.js b/web/pages/web/web.js deleted file mode 100755 index 49d61005..00000000 --- a/web/pages/web/web.js +++ /dev/null @@ -1,493 +0,0 @@ - -window.addEventListener ('load', - function () { Vn.Web.initialize (); }); - -Vn.Web = -{ - forms: {} - ,activeForm: null - ,activeCss: null - ,requestedForm: null - ,menuShown: false - ,menuOptions: {} - ,choosedOption: null - - ,initialize: function () - { - window.onerror = function (message, file, line) - { - var error = new Error (message); - error.fileName = file; - error.lineNumber = line; - - Htk.Toast.showError (_('InternalError')); - this.notifyError (error); - }.bind (this); - - this.loadingCount = 0; - this.loader = $('loader'); - this.formHolder = $('form-holder'); - - Vn.Hash.initialize (); - this.hash = Vn.Hash; - - this.hashParam = new Vn.HashParam ({key: 'form'}); - this.hashParam.on ('changed', this.onFormChange, this); - - $('background').onclick = function () {}; - - $('menu-button').addEventListener ('click', function (event) - { - event.stopPropagation (); - - if (!this.menuShown) - this.showMenu (); - else - this.hideMenu (); - }.bind (this)); - - $('menu-box').addEventListener ('click', function (event) - { - event.stopPropagation (); - }); - - if (!Vn.Cookie.check ('hedera_cookies')) - { - Vn.Cookie.set ('hedera_cookies', true); - Htk.Toast.showWarning (_('CookiesNotification')); - } - - this.conn = new Db.Conn (); - this.conn.on ('error', this.onConnError, this); - this.conn.on ('loading-changed', this.onConnLoading, this); -// this.conn.open (null, null, null, this.connOpened.bind (this)); - - var sql = 'SELECT default_form, image_dir, image_host FROM config;' - +'SELECT production_domain, test_domain FROM config;' - +'SELECT name FROM customer_view;' - +'CALL form_list ();'; - this.conn.execQuery (sql, this.onMainQueryDone.bind (this)); - } - - ,showBackground: function () - { - Vn.Node.show ($('background')); - } - - ,hideBackground: function () - { - Vn.Node.hide ($('background')); - } - - ,showMenu: function () - { - this.showBackground (); - Vn.Node.show ($('menu-box')); - this.menuShown = true; - - this.hideMenuCallback = this.hideMenu.bind (this); - document.addEventListener ('click', this.hideMenuCallback); - } - - ,hideMenu: function () - { - this.hideBackground (); - Vn.Node.hide ($('menu-box')); - $('menu-button').style.display = 'initial'; - this.menuShown = false; - - document.removeEventListener ('click', this.hideMenuCallback); - this.hideMenuCallback = null; - } - - ,onMainQueryDone: function (resultSet) - { - // Retrieving configuration parameters - - var res = resultSet.fetchResult (); - var columns = res.columns; - - if (res.next ()) - for (var i = 0; i < res.columns.length; i++) - Vn.Config[columns[i].name] = res.get (columns[i].name); - - // Retrieving configuration parameters - - var res = resultSet.fetchResult (); - - if (res.next () && res.get ('test_domain')) - { - if (location.host != res.get ('production_domain')) - { - var linkText = 'ReturnToOldWebsite'; - var linkField = 'production_domain'; - } - else - { - var linkText = 'TestTheNewWebsite'; - var linkField = 'test_domain'; - } - - Vn.Node.setText ($('test-link'), _(linkText)); - $('test-link').href = '//'+ res.get (linkField); - } - else - Vn.Node.hide ($('test-link')); - - // Retrieving the user name - - var userName = resultSet.fetchValue (); - - if (userName) - { - var span = $('user-name'); - span.appendChild (document.createTextNode (', '+ userName)); - } - - // Retrieving menu sections - - var res = resultSet.fetchResult (); - var sectionMap = {}; - - if (res) - for (var i = 0; res.next (); i++) - { - var parent = res.get ('parent'); - - if (!sectionMap[parent]) - sectionMap[parent] = []; - - sectionMap[parent].push (i); - } - - this.createMenu (res, sectionMap, null, $('menu')); - - // Loading the default form - - this.onFormChange (); - } - - ,notifyError: function (error) - { - if (error instanceof Error) - { - var httpRequest = new Vn.HttpRequest () - httpRequest.add - ({ - 'file': error.fileName - ,'line': error.lineNumber - ,'message': error.message - ,'stack': error.stack - }); - httpRequest.send ('log.php'); - } - } - - ,errorHandler: function (error) - { - if (error instanceof Vn.Error) - switch (error.domain) - { - case 'Auth': - this.unload (); - location.assign ('?page=login#!error='+ error.code); - break; - case 'Version': - this.newVersion (error); - break; - case 'User': - Htk.Toast.showError (error.message); - break; - default: - console.error (error.message); - Htk.Toast.showError (_('InternalError')); - } - else - { - console.error (error); - Htk.Toast.showError (_('InternalError')); - this.notifyError (error); - } - } - - ,onConnError: function (conn, error) - { - this.errorHandler (error); - } - - ,onConnLoading: function (conn, isLoading) - { - if (isLoading) - this.loaderPush (); - else - this.loaderPop (); - } - - ,loaderPush: function () - { - this.loadingCount++; - - if (this.loadingCount == 1) - this.loader.style.visibility = 'visible'; - } - - ,loaderPop: function () - { - if (this.loadingCount == 0) - return; - - this.loadingCount--; - - if (this.loadingCount == 0) - this.loader.style.visibility = 'hidden'; - } - - ,newVersion: function (error) - { - if (this.newVersionBlock || this.skipVersion) - return; - - this.newVersionBlock = true; - - var reload; - var message = _('NewVersionAvailable') +"\n\n"+ error.message; - - if (error.code == 'criticalVersion') - { - alert (message) - reload = true; - } - else - { - reload = confirm (message); - this.skipVersion = true; - } - - if (reload) - { - this.unload (); - location.reload (); - } - - this.newVersionBlock = false; - } - - ,createMenu: function (res, sectionMap, parent, ul) - { - var sections = sectionMap[parent]; - - for (var i = 0; i < sections.length; i++) - { - res.row = sections[i]; - - var li = document.createElement ('li'); - ul.appendChild (li); - - var a = document.createElement ('a'); - a.href = Vn.Hash.make ({'form': res.get ('path')}); - this.menuOptions[res.get ('path')] = a; - li.appendChild (a); - - var text = document.createTextNode (_(res.get ('description'))); - a.appendChild (text); - - var formId = res.get ('id'); - - if (sectionMap[formId]) - { - var submenu = document.createElement ('ul'); - submenu.className = 'submenu'; - li.appendChild (submenu); - - li.addEventListener ('mouseover', - this.onLiMouseHover.bind (this, submenu, a)); - li.addEventListener ('mouseout', - this.onLiMouseOut.bind (this)); - - this.createMenu (res, sectionMap, formId, submenu); - } - } - } - - ,onLiMouseHover: function (submenu, parent) - { - if (Vn.isMobile ()) - return; - - this.hideSubmenu (); - this.activeSubmenu = submenu; - - var rect = parent.getBoundingClientRect (); - submenu.style.display = 'inline'; - submenu.style.left = rect.right +'px'; - submenu.style.top = rect.top +'px'; - } - - ,onLiMouseOut: function () - { - this.timeout = setTimeout (this.hideSubmenu.bind (this), 160); - } - - ,hideSubmenu: function () - { - var submenu = this.activeSubmenu; - - if (submenu) - { - submenu.style.display = 'none'; - clearTimeout (this.timeout); - this.activeSubmenu = null; - this.timeout = 0; - } - } - - ,onFormChange: function () - { - var formPath = this.hashParam.value; - this.openForm (formPath ? formPath : Vn.Config['default_form'], null); - } - - ,openForm: function (formPath, callback) - { - if (Vn.isMobile ()) - this.hideMenu (); - - this.loaderPush (); - - this.requestedForm = formPath; - - var formInfo = this.forms[formPath]; - var path = 'forms/'+ formPath; - - if (this.activeForm) - { - this.activeForm.close (); - this.activeForm.unref (); - this.activeForm = null; - } - - if (this.activeCss) - { - Vn.excludeCss (this.activeCss +'/style.css'); - - if (Vn.isMobile ()) - Vn.excludeCss (this.activeCss +'/mobile.css'); - } - - this.activeCss = path; - - Vn.includeCss (this.activeCss +'/style.css'); - - if (Vn.isMobile ()) - Vn.includeCss (this.activeCss +'/mobile.css'); - - if (!formInfo) - { - var aux = formPath.split ('/'); - var formName = aux[aux.length - 1]; - - var klass = 'Vn.'+ formName.charAt (0).toUpperCase (); - klass += formName.substr (1).replace (/\w\-\w/g, function (token) - { - return token.charAt (0) + token.charAt (2).toUpperCase (); - }); - - formInfo = { - path: formPath - ,klass: klass - ,localeReady: false - ,jsReady: false - ,uiReady: false - ,error: false - ,ready: false - ,callbacks: [] - }; - - Vn.Locale.load (path, - this.onFormLocaleReady.bind (this, formInfo)); - Vn.includeJs (path +'/'+ formName +'.js', - this.onFormJsReady.bind (this, formInfo)); - Vn.loadXml ('forms/'+ formPath +'/ui.xml', - this.onFormUiReady.bind (this, formInfo)); - - this.forms[formPath] = formInfo; - } - - var newChoosedOption = this.menuOptions[formInfo.path]; - - if (newChoosedOption) - { - if (this.choosedOption) - this.choosedOption.className = null; - - newChoosedOption.className = 'selected'; - this.choosedOption = newChoosedOption; - } - - if (callback) - formInfo.callbacks.push (callback); - if (formInfo.ready) - this.onFormReady (formInfo); - } - - ,onFormLocaleReady: function (formInfo, success) - { - formInfo.localeReady = true; - this.onFormReady (formInfo); - } - - ,onFormJsReady: function (formInfo, success) - { - formInfo.jsReady = true; - formInfo.error = !success; - this.onFormReady (formInfo); - } - - ,onFormUiReady: function (formInfo, success) - { - formInfo.uiReady = true; - formInfo.error = !success; - this.onFormReady (formInfo); - } - - ,onFormReady: function (formInfo) - { - if (!(formInfo.localeReady && formInfo.jsReady && formInfo.uiReady)) - return; - - formInfo.ready = true; - - if (!formInfo.error) - { - if (formInfo.path == this.requestedForm) - try { - var klass = eval (formInfo.klass); - this.activeForm = new klass (this, formInfo); - this.activeForm.open (); - this.activeForm.activate (); - } - catch (e) { - formInfo.error = true; - this.errorHandler (error); - } - } - else - Htk.Toast.showError (_('ErrorLoadingForm')); - - var callbacks = formInfo.callbacks; - formInfo.callbacks = []; - - for (var i = 0; i < callbacks.length; i++) - callbacks[i] (this.activeForm); - - this.loaderPop (); - } - - ,unload: function () - { - this.hashParam.unref (); - this.conn.disconnect ('error', this.onConnError, this); - this.conn.disconnect ('loading-changed', this.onConnLoading, this); - } -}; - diff --git a/web/reports/delivery-note/delivery-note.js b/web/reports/delivery-note/delivery-note.js old mode 100755 new mode 100644 diff --git a/web/reports/items-report/items-report.js b/web/reports/items-report/items-report.js old mode 100755 new mode 100644 diff --git a/web/reports/shelves-report/shelves-report.js b/web/reports/shelves-report/shelves-report.js old mode 100755 new mode 100644 diff --git a/web/reports/shelves/report.xml b/web/reports/shelves/report.xml deleted file mode 100755 index 4874b410..00000000 --- a/web/reports/shelves/report.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
-

- -

-
- -
-
- diff --git a/web/reports/shelves/shelves.js b/web/reports/shelves/shelves.js deleted file mode 100755 index 5344cde6..00000000 --- a/web/reports/shelves/shelves.js +++ /dev/null @@ -1,5 +0,0 @@ - -Vn.ShelvesReport = new Class -({ - Extends: Vn.Report -}); diff --git a/web/reports/shelves/style.css b/web/reports/shelves/style.css deleted file mode 100644 index 9b140684..00000000 --- a/web/reports/shelves/style.css +++ /dev/null @@ -1,109 +0,0 @@ - -/* Shelves */ - -h1 -{ - font-weight: normal; - font-size: 500%; - margin: 0; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; -} -h2.subtitle -{ - margin: 0; - font-size: 400%; - font-weight: normal; - color: #333; -} -h1.page-number -{ - padding-left: 4mm; - float: right; - text-align: right; -} -.shelf -{ - position: relative; - margin: 0 auto; - padding-top: 10mm; -} -.edge, -.tray -{ - position: absolute; - border-top: 2px solid black; - box-sizing: border-box; -} -.edge -{ - width: 0; -} -.box -{ - position: absolute; - border: 1px solid black; - border-bottom: 0; - box-sizing: border-box; -} -.box .box-label -{ - text-align: right; - font-size: 55%; - word-wrap: break-word; - box-sizing: border-box; - padding: 0 4%; -} -.color0 -{ - background-color: #FDD !important; -} -.color1 -{ - background-color: #DFD !important; -} -.color2 -{ - background-color: #DDF !important; -} -.color3 -{ - background-color: #DFF !important; -} -.color4 -{ - background-color: #FFD !important; -} - -/* Remaining amounts*/ - -ul -{ - list-style-type: none; -} -li * -{ - font-size: 200%; - line-height: 200%; -} -.item-id -{ - display: inline-block; - text-align: right; - margin: 0 5mm; - width: 30mm; -} -.item -{ - display: inline-block; - width: 80mm; -} -.amount -{ - color: #666; - width: 10mm; - text-align: right; - padding-right: 1mm; -} - diff --git a/web/rest/image.php b/web/rest/image.php index dff39c13..8c360fe0 100755 --- a/web/rest/image.php +++ b/web/rest/image.php @@ -10,6 +10,10 @@ class RestMod extends Rest\Module { function run () { +// throw new Rest\Exception ('Image', 'inMaintenance', +// 'Servicio no disponible temporalmente por '. +// 'mantenimiento, intentalo de nuevo más tarde'); + try { Image\Db::init (Auth::getUser (), Auth::getPassword ()); Image\Db::upload ();