Cambios comunicación

This commit is contained in:
Juan Ferrer Toribio 2017-04-27 10:27:39 +02:00
parent f4416cc39a
commit cb305ca7d9
19 changed files with 23 additions and 11 deletions

2
app.js
View File

@ -2,7 +2,7 @@
var host = window.location.host.split(':')[0]; var host = window.location.host.split(':')[0];
if (_DEV_MODE) if (_DEV_MODE)
host = host +':8080'; host = host +':9000';
__webpack_public_path__ = '//'+ host +'/build/'; __webpack_public_path__ = '//'+ host +'/build/';

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.398-deb8) stable; urgency=low hedera-web (1.399-deb8) stable; urgency=low
* Initial Release. * Initial Release.

View File

@ -15,6 +15,7 @@
<db-model property="model"> <db-model property="model">
<custom> <custom>
SELECT title, date_time, text, image, id FROM news SELECT title, date_time, text, image, id FROM news
WHERE tag != 'course'
ORDER BY priority, date_time DESC ORDER BY priority, date_time DESC
</custom> </custom>
</db-model> </db-model>

View File

@ -4,6 +4,7 @@
,"Title": "Títol" ,"Title": "Títol"
,"NewBody": "Cos" ,"NewBody": "Cos"
,"Tag": "Etiqueta" ,"Tag": "Etiqueta"
,"Priority": "Prioritat"
,"Return": "Tornar" ,"Return": "Tornar"
,"Accept": "Acceptar" ,"Accept": "Acceptar"

View File

@ -4,6 +4,7 @@
,"Title": "Title" ,"Title": "Title"
,"NewBody": "New body" ,"NewBody": "New body"
,"Tag": "Tag" ,"Tag": "Tag"
,"Priority": "Priority"
,"Return": "Return" ,"Return": "Return"
,"Accept": "Accept" ,"Accept": "Accept"

View File

@ -4,6 +4,7 @@
,"Title": "Título" ,"Title": "Título"
,"NewBody": "Cuerpo" ,"NewBody": "Cuerpo"
,"Tag": "Etiqueta" ,"Tag": "Etiqueta"
,"Priority": "Prioridad"
,"Return": "Volver" ,"Return": "Volver"
,"Accept": "Aceptar" ,"Accept": "Aceptar"

View File

@ -4,6 +4,7 @@
,"Title": "Titre" ,"Title": "Titre"
,"NewBody": "Corps" ,"NewBody": "Corps"
,"Tag": "Tag" ,"Tag": "Tag"
,"Priority": "Priorité"
,"Return": "Reviens" ,"Return": "Reviens"
,"Accept": "Accepter" ,"Accept": "Accepter"

View File

@ -4,6 +4,7 @@
,"Title": "Title" ,"Title": "Title"
,"NewBody": "New body" ,"NewBody": "New body"
,"Tag": "Tag" ,"Tag": "Tag"
,"Priority": "Priority"
,"Return": "Return" ,"Return": "Return"
,"Accept": "Accept" ,"Accept": "Accept"

View File

@ -4,6 +4,7 @@
,"Title": "Título" ,"Title": "Título"
,"NewBody": "Corpo" ,"NewBody": "Corpo"
,"Tag": "Etiqueta" ,"Tag": "Etiqueta"
,"Priority": "Prioridade"
,"Return": "Voltar" ,"Return": "Voltar"
,"Accept": "Aceitar" ,"Accept": "Aceitar"

View File

@ -9,7 +9,7 @@
updatable="true" updatable="true"
on-operations-done="onOperationsDone"> on-operations-done="onOperationsDone">
<custom> <custom>
SELECT id, title, text, tag SELECT id, title, text, tag, priority
FROM news WHERE id = #new FROM news WHERE id = #new
</custom> </custom>
<sql-batch property="batch"> <sql-batch property="batch">
@ -52,6 +52,10 @@
</db-model> </db-model>
</htk-combo> </htk-combo>
</div> </div>
<div class="form-group">
<label><t>Priority</t></label>
<htk-entry form="iter" column="priority"/>
</div>
<div class="form-group"> <div class="form-group">
<label><t>NewBody</t></label> <label><t>NewBody</t></label>
<textarea id="html-editor"/> <textarea id="html-editor"/>

View File

@ -3,7 +3,7 @@
,"Password": "Contrasenya" ,"Password": "Contrasenya"
,"Beta": "Beta" ,"Beta": "Beta"
,"Do not sign out": "No tancar sessió" ,"Do not sign out": "No tancar sessió"
,"I want to know more": "Vull saber-ne més!" ,"Log in as guest": "Accedir com a convidat"
,"Enter": "Entrar" ,"Enter": "Entrar"
,"Login mail": "clientes@verdnatura.es" ,"Login mail": "clientes@verdnatura.es"
,"Login phone": "+34 607 562 391" ,"Login phone": "+34 607 562 391"

View File

@ -3,7 +3,7 @@
,"Password": "Password" ,"Password": "Password"
,"Beta": "Beta" ,"Beta": "Beta"
,"Do not sign out": "Do not sign out" ,"Do not sign out": "Do not sign out"
,"I want to know more": "I want to know more" ,"Log in as guest": "Log in as guest"
,"Enter": "Enter" ,"Enter": "Enter"
,"Login mail": "clientes@verdnatura.es" ,"Login mail": "clientes@verdnatura.es"
,"Login phone": "+34 607 562 391" ,"Login phone": "+34 607 562 391"

View File

@ -3,7 +3,7 @@
,"Password": "Contraseña" ,"Password": "Contraseña"
,"Beta": "Beta" ,"Beta": "Beta"
,"Do not sign out": "No cerrar sesión" ,"Do not sign out": "No cerrar sesión"
,"I want to know more": "¡Quiero saber más!" ,"Log in as guest": "Entrar como invitado"
,"Enter": "Entrar" ,"Enter": "Entrar"
,"Login mail": "clientes@verdnatura.es" ,"Login mail": "clientes@verdnatura.es"
,"Login phone": "+34 963 242 100" ,"Login phone": "+34 963 242 100"

View File

@ -3,7 +3,7 @@
,"Password": "Mot de passe" ,"Password": "Mot de passe"
,"Beta": "Beta" ,"Beta": "Beta"
,"Do not sign out": "Garder ma session active" ,"Do not sign out": "Garder ma session active"
,"I want to know more": "En savoir plus!" ,"Log in as guest": "Entrez en tant qu'invité"
,"Enter": "Entrer" ,"Enter": "Entrer"
,"Login mail": "ruben@verdnatura.es" ,"Login mail": "ruben@verdnatura.es"
,"Login phone": "+33 781 533 900" ,"Login phone": "+33 781 533 900"

View File

@ -3,7 +3,7 @@
,"Password": "нууц үг" ,"Password": "нууц үг"
,"Beta": "Бета" ,"Beta": "Бета"
,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна" ,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна"
,"I want to know more": "Би илүү ихийг мэдэхийг хүсч байна" ,"Log in as guest": "Зочин байдлаар оруулна уу"
,"Enter": "энд бичнэ үү" ,"Enter": "энд бичнэ үү"
,"Login mail": "clientes@verdnatura.es" ,"Login mail": "clientes@verdnatura.es"
,"Login phone": "+34 607 562 391" ,"Login phone": "+34 607 562 391"

View File

@ -3,7 +3,7 @@
,"Password": "Palavra-Passe" ,"Password": "Palavra-Passe"
,"Beta": "Beta" ,"Beta": "Beta"
,"Do not sign out": "Não finalizar Sessão" ,"Do not sign out": "Não finalizar Sessão"
,"I want to know more": "Quero saber mais..." ,"Log in as guest": "Digite como convidado"
,"Enter": "Entrar" ,"Enter": "Entrar"
,"Login mail": "clientes@verdnatura.es" ,"Login mail": "clientes@verdnatura.es"
,"Login phone": "+34 963 242 100" ,"Login phone": "+34 963 242 100"

View File

@ -3,7 +3,7 @@
<div class="navbar"> <div class="navbar">
<div> <div>
<a href="#!form=cms/about&amp;guest=true"> <a href="#!form=cms/about&amp;guest=true">
<t>I want to know more</t> <t>Log in as guest</t>
</a> </a>
</div> </div>
</div> </div>

View File

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

View File

@ -34,6 +34,7 @@ var config = {
devServer: { devServer: {
inline: true, inline: true,
host: '0.0.0.0', host: '0.0.0.0',
port: '9000',
headers: { "Access-Control-Allow-Origin": "*" } headers: { "Access-Control-Allow-Origin": "*" }
}, },
devtool: 'eval-source-map' devtool: 'eval-source-map'