diff --git a/forms/cms/home/ui.xml b/forms/cms/home/ui.xml index 7000d9e0..88183a29 100755 --- a/forms/cms/home/ui.xml +++ b/forms/cms/home/ui.xml @@ -14,6 +14,7 @@ <htk-repeater form-id="new"> <db-model property="model"> SELECT title, date_time, text, image, id FROM news + WHERE tag != 'course' ORDER BY priority, date_time DESC </db-model> <custom> diff --git a/forms/news/new/locale/ca.json b/forms/news/new/locale/ca.json index a0cdb622..4c85c5b0 100755 --- a/forms/news/new/locale/ca.json +++ b/forms/news/new/locale/ca.json @@ -4,6 +4,7 @@ ,"Title": "Títol" ,"NewBody": "Cos" ,"Tag": "Etiqueta" + ,"Priority": "Prioritat" ,"Return": "Tornar" ,"Accept": "Acceptar" diff --git a/forms/news/new/locale/en.json b/forms/news/new/locale/en.json index 0213d99a..c6c807b0 100755 --- a/forms/news/new/locale/en.json +++ b/forms/news/new/locale/en.json @@ -4,6 +4,7 @@ ,"Title": "Title" ,"NewBody": "New body" ,"Tag": "Tag" + ,"Priority": "Priority" ,"Return": "Return" ,"Accept": "Accept" diff --git a/forms/news/new/locale/es.json b/forms/news/new/locale/es.json index f55b512b..2b9b2ca4 100755 --- a/forms/news/new/locale/es.json +++ b/forms/news/new/locale/es.json @@ -4,6 +4,7 @@ ,"Title": "Título" ,"NewBody": "Cuerpo" ,"Tag": "Etiqueta" + ,"Priority": "Prioridad" ,"Return": "Volver" ,"Accept": "Aceptar" diff --git a/forms/news/new/locale/fr.json b/forms/news/new/locale/fr.json index 0b0c1c84..a178493f 100755 --- a/forms/news/new/locale/fr.json +++ b/forms/news/new/locale/fr.json @@ -4,6 +4,7 @@ ,"Title": "Titre" ,"NewBody": "Corps" ,"Tag": "Tag" + ,"Priority": "Priorité" ,"Return": "Reviens" ,"Accept": "Accepter" diff --git a/forms/news/new/locale/mn.json b/forms/news/new/locale/mn.json index 0213d99a..c6c807b0 100755 --- a/forms/news/new/locale/mn.json +++ b/forms/news/new/locale/mn.json @@ -4,6 +4,7 @@ ,"Title": "Title" ,"NewBody": "New body" ,"Tag": "Tag" + ,"Priority": "Priority" ,"Return": "Return" ,"Accept": "Accept" diff --git a/forms/news/new/locale/pt.json b/forms/news/new/locale/pt.json index 8dc040d1..e35497ff 100644 --- a/forms/news/new/locale/pt.json +++ b/forms/news/new/locale/pt.json @@ -4,6 +4,7 @@ ,"Title": "Título" ,"NewBody": "Corpo" ,"Tag": "Etiqueta" + ,"Priority": "Prioridade" ,"Return": "Voltar" ,"Accept": "Aceitar" diff --git a/forms/news/new/ui.xml b/forms/news/new/ui.xml index f86a5350..6807bef6 100755 --- a/forms/news/new/ui.xml +++ b/forms/news/new/ui.xml @@ -7,7 +7,7 @@ updatable="true" lot="hash" on-operations-done="onOperationsDone"> - SELECT id, title, text, tag + SELECT id, title, text, tag, priority FROM news WHERE id = #new </db-model> </db-form> @@ -41,6 +41,10 @@ </db-model> </htk-combo> </div> + <div> + <label><t>Priority</t></label> + <htk-entry form="iter" column="priority"/> + </div> <div> <label><t>NewBody</t></label> <textarea id="html-editor"/> diff --git a/js/hedera/locale/ca.json b/js/hedera/locale/ca.json index d60b1289..6e8a99f0 100644 --- a/js/hedera/locale/ca.json +++ b/js/hedera/locale/ca.json @@ -3,7 +3,7 @@ ,"Password": "Contrasenya" ,"Beta": "Beta" ,"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" ,"Login mail": "clientes@verdnatura.es" ,"Login phone": "+34 607 562 391" diff --git a/js/hedera/locale/en.json b/js/hedera/locale/en.json index aa7b2bd5..ea6d9e3f 100644 --- a/js/hedera/locale/en.json +++ b/js/hedera/locale/en.json @@ -3,7 +3,7 @@ ,"Password": "Password" ,"Beta": "Beta" ,"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" ,"Login mail": "clientes@verdnatura.es" ,"Login phone": "+34 607 562 391" diff --git a/js/hedera/locale/es.json b/js/hedera/locale/es.json index a02db79d..93a365f5 100644 --- a/js/hedera/locale/es.json +++ b/js/hedera/locale/es.json @@ -3,7 +3,7 @@ ,"Password": "Contraseña" ,"Beta": "Beta" ,"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" ,"Login mail": "clientes@verdnatura.es" ,"Login phone": "+34 963 242 100" diff --git a/js/hedera/locale/fr.json b/js/hedera/locale/fr.json index e77ce879..9ff1e6fb 100644 --- a/js/hedera/locale/fr.json +++ b/js/hedera/locale/fr.json @@ -3,7 +3,7 @@ ,"Password": "Mot de passe" ,"Beta": "Beta" ,"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" ,"Login mail": "ruben@verdnatura.es" ,"Login phone": "+33 781 533 900" diff --git a/js/hedera/locale/mn.json b/js/hedera/locale/mn.json index 9af24bc8..425a379b 100644 --- a/js/hedera/locale/mn.json +++ b/js/hedera/locale/mn.json @@ -3,7 +3,7 @@ ,"Password": "нууц үг" ,"Beta": "Бета" ,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна" - ,"I want to know more": "Би илүү ихийг мэдэхийг хүсч байна" + ,"Log in as guest": "Зочин байдлаар оруулна уу" ,"Enter": "энд бичнэ үү" ,"Login mail": "clientes@verdnatura.es" ,"Login phone": "+34 607 562 391" diff --git a/js/hedera/locale/pt.json b/js/hedera/locale/pt.json index 21409416..55356558 100644 --- a/js/hedera/locale/pt.json +++ b/js/hedera/locale/pt.json @@ -3,7 +3,7 @@ ,"Password": "Palavra-Passe" ,"Beta": "Beta" ,"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" ,"Login mail": "clientes@verdnatura.es" ,"Login phone": "+34 963 242 100" diff --git a/js/hedera/login.xml b/js/hedera/login.xml index 68d387bd..803e7c80 100755 --- a/js/hedera/login.xml +++ b/js/hedera/login.xml @@ -3,7 +3,7 @@ <div class="navbar"> <div> <a href="#!form=cms/about&guest=true"> - <t>I want to know more</t> + <t>Log in as guest</t> </a> </div> </div>