diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig index 9e8d4c9ac6..c069066838 100644 --- a/templates/web/prod/upload/upload-flash.html.twig +++ b/templates/web/prod/upload/upload-flash.html.twig @@ -24,19 +24,22 @@ {#
{% trans 'Choose files to add' %} :
#} {# action bar #} -
-
+
+

- - {% trans 'Switch to html5 uploader' %} - -
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %}) {# #}
+
+ +
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+ {% trans 'Switch' %} +
{# settings box #} @@ -105,6 +108,7 @@
+
{% trans 'Transmited files' %} :
#}
+ +
+ +
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+ {% trans 'Switch' %} +
{# settings box #} diff --git a/www/skins/icons/html5-logo.jpeg b/www/skins/icons/html5-logo.jpeg new file mode 100644 index 0000000000..deb6868477 Binary files /dev/null and b/www/skins/icons/html5-logo.jpeg differ diff --git a/www/skins/icons/logo-flash.png b/www/skins/icons/logo-flash.png new file mode 100644 index 0000000000..43243e32b1 Binary files /dev/null and b/www/skins/icons/logo-flash.png differ diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 6c49dc0e7d..2752ec6f1a 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -4084,6 +4084,32 @@ dans l'onglet thesaurus : arbres, menus contextuels height: 10px; } +#uploadBox .uploader-info { + text-align:left; + font-size:10px; + margin:5px 0; +} + +#uploadBox .uploader-icon { + text-align:left; +} + +#uploadBox .uploader-icon img{ + margin:10px auto; +} + +#uploadBox .uploader-info p { + line-height:10px; + font-size:10px; + word-wrap: break-word; +} + +#uploadBox .uploader-info a { + text-decoration: underline; + color: darkblue; + margin:5px 0; +} + #uploadBoxRight .progress .progress-bar { height: 10px; } diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 97995c57fe..cdd14a562b 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -4215,6 +4215,33 @@ dans l'onglet thesaurus : arbres, menus contextuels font-style: normal; } + +#uploadBox .uploader-info { + text-align:left; + font-size:10px; + margin:5px 0; +} + +#uploadBox .uploader-icon { + text-align:left; +} + +#uploadBox .uploader-icon img{ + margin:10px auto; +} + +#uploadBox .uploader-info p { + line-height:10px; + font-size:10px; + word-wrap: break-word; +} + +#uploadBox .uploader-info a { + text-decoration: underline; + color: darkblue; + margin:5px 0; +} + #uploadBoxRight .progress { margin-top: 4px; margin-bottom: 10px;