This commit is contained in:
Juan Ferrer Toribio 2016-11-07 19:35:43 +01:00
parent a71b196fef
commit 158009dc83
9 changed files with 153 additions and 249 deletions

View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="24"
height="24.000189"
viewBox="0 0 24 24.00019"
enable-background="new 0 0 266.893 266.895"
xml:space="preserve"
inkscape:version="0.48.5 r10040"
sodipodi:docname="facebook.svg"><metadata
id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1014"
id="namedview5"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="0.8842429"
inkscape:cx="-148.21469"
inkscape:cy="128.85949"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><path
id="Blue_1_"
d="m 22.67547,24.00019 c 0.731407,0 1.324523,-0.59312 1.324523,-1.32471 V 1.32462 C 23.999993,0.59293 23.40697,0 22.67547,0 H 1.3246076 C 0.59292132,0 -8.1786701e-6,0.59293 -8.1786701e-6,1.32462 v 21.35086 c 0,0.7315 0.5928363986701,1.32471 1.3246157786701,1.32471 H 22.67547 z"
inkscape:connector-curvature="0"
style="fill:#3c5a99" /><path
id="f"
d="m 16.559645,24.00019 v -9.2942 h 3.119608 L 20.14637,11.08388 H 16.559645 V 8.77139 c 0,-1.04868 0.291203,-1.76333 1.794993,-1.76333 l 1.91801,-8.4e-4 V 3.76758 c -0.331712,-0.0441 -1.470263,-0.14276 -2.794879,-0.14276 -2.765359,0 -4.658599,1.68799 -4.658599,4.78785 v 2.67121 H 9.6915528 v 3.62211 H 12.81917 v 9.2942 h 3.740475 z"
inkscape:connector-curvature="0"
style="fill:#ffffff" /></svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="23.999996"
id="svg11927"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="youtube.svg">
<defs
id="defs3" />
<sodipodi:namedview
inkscape:document-units="mm"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="34.458339"
inkscape:cx="12"
inkscape:cy="11.999998"
inkscape:current-layer="layer1"
showgrid="false"
units="mm"
borderlayer="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-65.660672,-187.08936)">
<path
style="display:inline;fill:#c30000;fill-opacity:1;stroke:none"
d="m 68.556274,210.90728 c -2.293676,-0.68242 -2.880675,-2.99702 -2.89518,-11.41603 -0.01025,-5.94721 0.16327,-7.96905 0.8512,-9.91843 0.533461,-1.51166 1.175311,-1.99041 3.044687,-2.271 1.814867,-0.27243 11.459517,-0.28622 15.293322,-0.0219 5.345509,0.48245 4.737665,4.05194 4.797522,11.13 0.06208,7.3381 -0.07728,8.93495 -0.942902,10.80584 -0.857753,1.85393 -0.528524,1.79528 -10.467486,1.86487 -5.046389,0.0354 -9.231633,-0.0396 -9.681163,-0.17336 z m 14.013699,-11.9128 c -9.225923,-6.1861 1.31465,0.90117 -8.167348,-5.4762 0.0541,2.97456 0.0086,8.38462 0.04076,11.04998 9.474933,-6.37668 -1.004697,0.69337 8.126587,-5.57378 z"
id="path11905"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssscccsccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@ -10,56 +9,60 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="24"
height="23.999599"
viewBox="0 0 24 23.999599"
enable-background="new 0 0 120 120"
xml:space="preserve"
height="23.999996"
id="svg11927"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="youtube.svg"><defs
id="defs13" /><sodipodi:namedview
sodipodi:docname="youtube.svg">
<defs
id="defs3" />
<sodipodi:namedview
inkscape:document-units="mm"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1043"
id="namedview11"
inkscape:zoom="34.458339"
inkscape:cx="12"
inkscape:cy="11.999998"
inkscape:current-layer="layer1"
showgrid="false"
units="mm"
borderlayer="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="35.54226"
inkscape:cx="12"
inkscape:cy="11.9998"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Capa_1" /><metadata
id="metadata3"><ns:sfw><ns:slices /><ns:sliceSourceBounds
height="119.998"
width="120"
y="-119.998"
x="0"
bottomLeftOrigin="true" /></ns:sfw><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
id="g5"
transform="scale(0.2,0.2)"><path
d="m 120,93.068 c 0,14.875 -12.059,26.93 -26.934,26.93 l -66.135,0 C 12.06,119.998 0,107.943 0,93.068 L 0,26.932 C 0,12.059 12.06,0 26.931,0 L 93.066,0 C 107.941,0 120,12.059 120,26.932 l 0,66.136 z"
id="path7"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-65.660672,-187.08936)">
<path
style="display:inline;fill:#c30000;fill-opacity:1;stroke:none"
d="m 68.556274,210.90728 c -2.293676,-0.68242 -2.880675,-2.99702 -2.89518,-11.41603 -0.01025,-5.94721 0.16327,-7.96905 0.8512,-9.91843 0.533461,-1.51166 1.175311,-1.99041 3.044687,-2.271 1.814867,-0.27243 11.459517,-0.28622 15.293322,-0.0219 5.345509,0.48245 4.737665,4.05194 4.797522,11.13 0.06208,7.3381 -0.07728,8.93495 -0.942902,10.80584 -0.857753,1.85393 -0.528524,1.79528 -10.467486,1.86487 -5.046389,0.0354 -9.231633,-0.0396 -9.681163,-0.17336 z m 14.013699,-11.9128 c -9.225923,-6.1861 1.31465,0.90117 -8.167348,-5.4762 0.0541,2.97456 0.0086,8.38462 0.04076,11.04998 9.474933,-6.37668 -1.004697,0.69337 8.126587,-5.57378 z"
id="path11905"
inkscape:connector-curvature="0"
style="fill:#da3b35" /><path
d="m 33.312,82.178 c -2.537,-0.832 -4.246,-2.496 -5.159,-5.014 -2.237,-6.141 -2.894,-31.838 1.404,-36.896 1.469,-1.733 3.365,-2.748 5.618,-2.989 11.588,-1.244 47.407,-1.067 51.535,0.42 2.419,0.868 4.136,2.451 5.069,4.875 2.443,6.35 2.528,29.454 -0.32,35.569 -0.775,1.66 -2.038,2.83 -3.637,3.67 -4.323,2.263 -48.824,2.236 -54.51,0.365 z M 51.723,70.131 C 58.692,66.518 65.6,62.94 72.597,59.31 65.592,55.653 58.68,52.048 51.723,48.418 c 0,7.257 0,14.439 0,21.713 z"
id="path9"
inkscape:connector-curvature="0"
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /></g></svg>
sodipodi:nodetypes="cssscccsccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -25,10 +25,15 @@ module.exports = new Class
var conn = new Db.Connection ();
this.link ({_conn: conn}, {'error': this._onConnError});
this.initAutoLogin ();
}
,run: function ()
{
if (this.tryAutoLogin ())
return;
var login = this._login = new Login ({conn: this._conn});
login.on ('login', this._onLogin, this);
login.show ();
@ -45,7 +50,7 @@ module.exports = new Class
,_onLogout: function (gui)
{
localStorage.removeItem ('hederaGuest');
this.clearAutoLogin ();
this._freeGui ();
this.run ();
}
@ -155,7 +160,88 @@ module.exports = new Class
{
this._freeLogin ();
this._freeGui ();
this.deinitAutoLogin ();
this._conn.unref ();
}
// Auto login functionality
,_firstLogin: true
,initAutoLogin: function ()
{
var isGuest = new Vn.HashParam
({
type: Boolean,
key: 'guest'
});
this.link ({_isGuest: isGuest}, {'changed': this._onGuestChange});
var token = new Vn.HashParam
({
type: String,
key: 'token'
});
this.link ({_token: token}, {'changed': this._onTokenChange});
}
,_onGuestChange: function ()
{
if (this._isGuest.value)
setTimeout (this.tryAutoLogin.bind (this));
}
,_onTokenChange: function ()
{
if (this._token.value)
setTimeout (this.tryAutoLogin.bind (this));
}
,deinitAutoLogin: function ()
{
this._isGuest.unref ();
this._token.unref ();
}
,autoLogin: function ()
{
var guest = localStorage.getItem ('hederaGuest');
if (this._isGuest.value || guest)
{
localStorage.setItem ('hederaGuest', true);
return true;
}
if (this._token.value)
this._conn.token = this._token.value;
else
this._conn.fetchToken ();
if (this._conn.token)
return true;
return false;
}
,tryAutoLogin: function ()
{
var ok = this.autoLogin ();
this._firstLogin = false;
this._isGuest.value = undefined;
this._token.value = undefined;
if (!ok)
return false;
this._onLogin ();
return true;
}
,clearAutoLogin: function ()
{
localStorage.removeItem ('hederaGuest');
}
});

View File

@ -302,8 +302,8 @@
@media (max-width: 960px)
{
.action-bar span.label,
.htk-button > span
.vn-gui .action-bar span.label,
.vn-gui .htk-button > span
{
display: none;
}

View File

@ -25,7 +25,7 @@ module.exports = new Class
{
this.parent (props);
this.builderInitString (Tpl);
this.$('social-bar').conn = this._conn;
var self = this;
@ -43,86 +43,32 @@ module.exports = new Class
else
this.$('spinner').stop ();
}
,show: function ()
,show: function (firstLogin)
{
document.body.appendChild (this.node);
var isGuest = new Vn.HashParam
({
type: Boolean,
key: 'guest'
});
this.link ({_isGuest: isGuest}, {'changed': this._onGuestChange});
var lastUser = localStorage.getItem ('hederaLastUser');
var token = new Vn.HashParam
({
type: String,
key: 'token'
});
this.link ({_token: token}, {'changed': this._onTokenChange});
if (lastUser)
this.$('user').value = lastUser;
this._onGuestChange ();
this._onTokenChange ();
if (!this._loginStarted
&& (localStorage.getItem ('vnToken')
|| sessionStorage.getItem ('vnToken')))
this.login ();
if (!this._loginStarted)
{
var lastUser = localStorage.getItem ('hederaLastUser');
if (lastUser)
this.$('user').value = lastUser;
this._focusUserInput ();
}
}
,_onTokenChange: function ()
{
if (!this.loginStarted && this._token.value)
{
this._conn.token = this._token.value;
this.login ();
}
}
,_onGuestChange: function ()
{
var guest = localStorage.getItem ('hederaGuest');
if (!this.loginStarted && (this._isGuest.value || guest))
{
localStorage.setItem ('hederaGuest', true);
this.login ();
}
this._focusUserInput ();
}
,_onSubmit: function ()
{
this.login (
this._conn.open (
this.$('user').value,
this.$('pass').value,
this.$('remember').checked
this.$('remember').checked,
this._onConnOpen.bind (this)
);
}
,login: function (user, pass, remember)
{
this._loginStarted = true;
this._conn.open (user, pass, remember,
this._onConnOpen.bind (this));
this._disableUi (true);
}
,_onConnOpen: function (conn, success, error)
{
this._token.value = undefined;
this._isGuest.value = undefined;
this._loginStarted = false;
this.$('pass').value = '';
this._disableUi (false);
@ -130,13 +76,13 @@ module.exports = new Class
{
var user = this.$('user').value;
if (user && !localStorage.getItem ('hederaGuest'))
if (user)
localStorage.setItem ('hederaLastUser', user);
this.signalEmit ('login');
}
else
{
localStorage.removeItem ('hederaGuest');
this._focusUserInput ();
throw error;
}
@ -144,8 +90,6 @@ module.exports = new Class
,hide: function ()
{
this._isGuest.unref ();
this._token.unref ();
Vn.Node.remove (this.node);
}

View File

@ -13,9 +13,5 @@ if ($result = $db->query ('SELECT name, content FROM metatag'))
}
$url = _DEV_MODE ? "http://{$_SERVER['SERVER_NAME']}:8080" : '.';
if (_DEV_MODE)
$this->includeJs ("$url/webpack-dev-server.js");
$this->includeJs ("$url/build/hedera-web.js");

View File

@ -29,7 +29,7 @@ class Sms extends Vn\Web\JsonRequest
$sms = $xmlResponse->sms;
$db->query (
'INSERT INTO vn2008.sms (Id_trabajador, `text`, `to`, `from`, sent, response, Id_Cliente)
VALUES (account.user_get_id(), #, #, #, #, #, #)',
VALUES (account.userGetId(), #, #, #, #, #, #)',
[
$_REQUEST['text']
,$_REQUEST['to']

View File

@ -29,19 +29,19 @@ module.exports =
fallback: process.env.NODE_PATH
},
plugins: [
new webpack.DefinePlugin ({ _DEV_MODE: devMode }),
new webpack.DefinePlugin ({ _DEV_MODE: devMode })/*,
new webpack.optimize.UglifyJsPlugin ({
minimize: true,
compress: {
warnings: false
}
})
})*/
],
devServer: {
inline: true,
host: '0.0.0.0',
headers: { "Access-Control-Allow-Origin": "*" }
},
devtool: 'source-map'
}/*,
devtool: 'source-map'*/
};