From 08d72c5a58671830da4cb201746e5e6eb87ddd03 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 22 Jan 2020 17:01:41 +0100 Subject: [PATCH] IE caching fixes, old pgsql code removed --- src/main.js | 28 ++++++------------------- src/style.css | 57 +++++++++++++++++---------------------------------- 2 files changed, 25 insertions(+), 60 deletions(-) diff --git a/src/main.js b/src/main.js index 7522986..7d3830f 100755 --- a/src/main.js +++ b/src/main.js @@ -100,27 +100,6 @@ var App = { 'Mysql ODBC 5.1 Driver', params ); - - // Creates the PosgreSQL ODBC connection - - var driverPath = this.getEnv('ProgramFiles') - +'\\psqlODBC\\0804\\bin\\psqlodbc35w.dll'; - - var params = { - 'Driver' : driverPath, - 'DESCRIPTION' : Conf.appName, - 'Servername' : Conf.dbHost, - 'DATABASE' : 'vn', - 'UID' : '', - 'USERNAME' : '', - 'PASSWORD' : '' - }; - - this.createOdbc( - 'verdnaturapg', - 'PostgreSQL Unicode', - params - ); // Marks the application as configured @@ -280,8 +259,13 @@ var App = { if (localVersion < lastVersion) { this._disableUi(true, _('Updating')); + + var queryString = lastVersion + ? 'v'+ lastVersion + : new Date().getTime(); + var request = new ActiveXObject('MSXML2.XMLHTTP'); - request.open('GET', this.remoteFile +'?'+ new Date().getTime(), true); + request.open('GET', this.remoteFile +'?'+ queryString, true); request.onreadystatechange = function() { App._onRequestReady(request); }; diff --git a/src/style.css b/src/style.css index 355f2e9..f615a43 100755 --- a/src/style.css +++ b/src/style.css @@ -1,5 +1,4 @@ -body -{ +body { font-size: 18px; padding: .8em; overflow: hidden; @@ -9,37 +8,30 @@ body /* Login form */ -#logo -{ +#logo { margin-bottom: .5em; } button, input, -select -{ +select { font-size: 1em; } -#fields -{ +#fields { max-width: 10em; margin: 0 auto; } -#fields > div -{ +#fields > div { margin-top: .5em; } -#fields > div > * -{ +#fields > div > * { display: block; } -label -{ +label { font-weight: normal; font-size: .9em; } input[type='text'], -input[type='password'] -{ +input[type='password'] { width: 100%; border: none; border-bottom: 1px solid #888; @@ -47,37 +39,31 @@ input[type='password'] color: #666; padding: .3em; } -#checkbox -{ +#checkbox { margin-top: .8em; } -#submit -{ +#submit { margin-top: .5em; } #checkbox, -#submit -{ +#submit { text-align: center; } -button -{ +button { border: none; color: #008D77; background-color: transparent; padding: .4em; text-transform: uppercase; } -button:hover -{ +button:hover { background-color: #EEE; cursor: pointer; } /* Message */ -#message -{ +#message { z-index: 2; position: absolute; top: 2em; @@ -95,8 +81,7 @@ button:hover /* Spinner */ -#background -{ +#background { z-index: 1; position: absolute; width: 100%; @@ -108,8 +93,7 @@ button:hover left: 0; display: none; } -#spinner -{ +#spinner { z-index: 2; position: absolute; padding: .8em; @@ -124,17 +108,14 @@ button:hover text-align: center; border: 1px solid black; } -#spinner * -{ +#spinner * { vertical-align: middle; } -#spinner img -{ +#spinner img { width: 1.8em; height: 1.8em; margin-right: .5em; } -#loading-message -{ +#loading-message { font-size: .9em; }