From 63a7ad74cda9aca31ec7e492e32c0cbc06c1075e Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Mon, 5 Jun 2017 10:30:05 +0200 Subject: [PATCH 1/2] Fix markdown font pb --- themes/default/public/css/markdown.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/default/public/css/markdown.css b/themes/default/public/css/markdown.css index f77f739..83f2411 100644 --- a/themes/default/public/css/markdown.css +++ b/themes/default/public/css/markdown.css @@ -1,10 +1,10 @@ @font-face { font-family: 'markdown'; - src:url('../font/markdown.eot?-6fnbp5'); - src:url('../font/markdown.eot?#iefix-6fnbp5') format('embedded-opentype'), - url('../font/markdown.woff?-6fnbp5') format('woff'), - url('../font/markdown.ttf?-6fnbp5') format('truetype'), - url('../font/markdown.svg?-6fnbp5#markdown') format('svg'); + src:url('../../font/markdown.eot?-6fnbp5'); + src:url('../../font/markdown.eot?#iefix-6fnbp5') format('embedded-opentype'), + url('../../font/markdown.woff?-6fnbp5') format('woff'), + url('../../font/markdown.ttf?-6fnbp5') format('truetype'), + url('../../font/markdown.svg?-6fnbp5#markdown') format('svg'); font-weight: normal; font-style: normal; } -- GitLab From 028961113c511e3e61f4cc68db9e624e4b48eb1a Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Mon, 5 Jun 2017 11:04:20 +0200 Subject: [PATCH 2/2] Fix #39 --- themes/default/lib/Lutim/I18N/de.po | 4 ++-- themes/default/lib/Lutim/I18N/en.po | 4 ++-- themes/default/lib/Lutim/I18N/es.po | 4 ++-- themes/default/lib/Lutim/I18N/fr.po | 4 ++-- themes/default/lib/Lutim/I18N/oc.po | 4 ++-- themes/default/templates/partial/lutim.js.ep | 4 ++++ 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/themes/default/lib/Lutim/I18N/de.po b/themes/default/lib/Lutim/I18N/de.po index e7df418..318a6bc 100644 --- a/themes/default/lib/Lutim/I18N/de.po +++ b/themes/default/lib/Lutim/I18N/de.po @@ -67,7 +67,7 @@ msgstr "Klicken um den Dateibrowser zu öffnen" msgid "Contributors" msgstr "Mitwirkende" -#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437 +#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441 msgid "Copy all view links to clipboard" msgstr "Alle Links zum Anschauen in die Zwischenablage kopieren" @@ -331,7 +331,7 @@ msgstr "Die Datei %1 ist kein Bild." #. ($tx->res->max_message_size) #. ($c->req->max_message_size) #. ($max_file_size) -#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332 +#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336 msgid "The file exceed the size limit (%1)" msgstr "Die Datei überschreitet die Größenbeschränkung (%1)" diff --git a/themes/default/lib/Lutim/I18N/en.po b/themes/default/lib/Lutim/I18N/en.po index 216915c..fccadd8 100644 --- a/themes/default/lib/Lutim/I18N/en.po +++ b/themes/default/lib/Lutim/I18N/en.po @@ -65,7 +65,7 @@ msgstr "Click to open the file browser" msgid "Contributors" msgstr "Contributors" -#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437 +#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441 msgid "Copy all view links to clipboard" msgstr "" @@ -327,7 +327,7 @@ msgstr "The file %1 is not an image." #. ($tx->res->max_message_size) #. ($c->req->max_message_size) #. ($max_file_size) -#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332 +#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336 msgid "The file exceed the size limit (%1)" msgstr "The file exceed the size limit (%1)" diff --git a/themes/default/lib/Lutim/I18N/es.po b/themes/default/lib/Lutim/I18N/es.po index 7f7a1be..d12366d 100644 --- a/themes/default/lib/Lutim/I18N/es.po +++ b/themes/default/lib/Lutim/I18N/es.po @@ -67,7 +67,7 @@ msgstr "Clic para abrir el explorador de archivos" msgid "Contributors" msgstr "Contribuidores" -#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437 +#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441 msgid "Copy all view links to clipboard" msgstr "Copiar todos los enlaces de visualización al portapapeles" @@ -329,7 +329,7 @@ msgstr "El archivo %1 no es una imagen." #. ($tx->res->max_message_size) #. ($c->req->max_message_size) #. ($max_file_size) -#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332 +#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336 msgid "The file exceed the size limit (%1)" msgstr "El archivo supera el límite de tamaño (%1)" diff --git a/themes/default/lib/Lutim/I18N/fr.po b/themes/default/lib/Lutim/I18N/fr.po index 9dd6e3c..84e3b7f 100644 --- a/themes/default/lib/Lutim/I18N/fr.po +++ b/themes/default/lib/Lutim/I18N/fr.po @@ -67,7 +67,7 @@ msgstr "Cliquez pour utiliser le navigateur de fichier" msgid "Contributors" msgstr "Contributeurs" -#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437 +#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441 msgid "Copy all view links to clipboard" msgstr "Copier tous les liens de visualisation dans le presse-papier" @@ -331,7 +331,7 @@ msgstr "Le fichier %1 n’est pas une image." #. ($tx->res->max_message_size) #. ($c->req->max_message_size) #. ($max_file_size) -#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332 +#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336 msgid "The file exceed the size limit (%1)" msgstr "Le fichier dépasse la limite de taille (%1)" diff --git a/themes/default/lib/Lutim/I18N/oc.po b/themes/default/lib/Lutim/I18N/oc.po index cd5acb7..9ba94c7 100644 --- a/themes/default/lib/Lutim/I18N/oc.po +++ b/themes/default/lib/Lutim/I18N/oc.po @@ -66,7 +66,7 @@ msgstr "Clicatz per utilizar lo navigador de fichièr" msgid "Contributors" msgstr "Contributors" -#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437 +#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441 msgid "Copy all view links to clipboard" msgstr "Copiar totes los ligams de visualizacion dins lo quichapapièrs" @@ -328,7 +328,7 @@ msgstr "Lo fichièr %1 es pas un imatge." #. ($tx->res->max_message_size) #. ($c->req->max_message_size) #. ($max_file_size) -#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332 +#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336 msgid "The file exceed the size limit (%1)" msgstr "Lo fichièr depassa lo limit de talha (%1)" diff --git a/themes/default/templates/partial/lutim.js.ep b/themes/default/templates/partial/lutim.js.ep index 73f1522..79481e3 100644 --- a/themes/default/templates/partial/lutim.js.ep +++ b/themes/default/templates/partial/lutim.js.ep @@ -314,6 +314,10 @@ ); } $('.messages').append(buildMessage(data.success, data.msg)); + $('#del-'+data.msg.real_short).on('click', function() { + rmFromShortHash(data.msg.short+'.'+data.msg.ext) + rmFromZipHash(data.msg.short); + }); $('#del-'+data.msg.real_short).on('click', delImage); if (data.success) { addToShortHash(data.msg.short+'.'+data.msg.ext); -- GitLab