diff --git a/templates/web/Mustache/Prod/Download-Items.Mustache.html b/templates/web/Mustache/Prod/Download-Items.Mustache.html index 449f0652fc..be7ae82cfb 100644 --- a/templates/web/Mustache/Prod/Download-Items.Mustache.html +++ b/templates/web/Mustache/Prod/Download-Items.Mustache.html @@ -1,13 +1,13 @@
  • -
    +

    {{ name }}

    -

    -

    +

    +

    diff --git a/templates/web/Mustache/Prod/Upload-Items.Mustache.html b/templates/web/Mustache/Prod/Upload-Items.Mustache.html index 5003176c62..5758c4e475 100644 --- a/templates/web/Mustache/Prod/Upload-Items.Mustache.html +++ b/templates/web/Mustache/Prod/Upload-Items.Mustache.html @@ -1,6 +1,6 @@
  • -
    +

    {{ name }}

    ({{ size }}, {{ type }})

    diff --git a/templates/web/prod/upload/lazaret.html.twig b/templates/web/prod/upload/lazaret.html.twig index d05bb57abe..f0c46308ff 100644 --- a/templates/web/prod/upload/lazaret.html.twig +++ b/templates/web/prod/upload/lazaret.html.twig @@ -3,16 +3,16 @@ {% if lazaretFiles|length > 0 %}
      {% for file in lazaretFiles %} -
    • +
    • {{ _self.lazaretElement(file) }}
      • {% endfor %}
    {% else %} - {% trans 'No document in quarantine' %} + {% trans "No document in quarantine" %} {% endif %} {% else %} - {% trans 'You do not have enough rights to access quarantine' %} + {% trans "You do not have enough rights to access quarantine" %} {% endif %}
    @@ -177,70 +177,72 @@ {% macro lazaretElement(file) %} {% import "common/thumbnail.html" as thumb %} {% set records = file.getRecordsToSubstitute() %} -
    -

    {% trans 'Last uploaded version' %}

    -
      +
      +
      {% trans "Last uploaded version" %}
      +
      • -
        - +
        +
        -

        {% trans 'Filename' %} : {{ file.getOriginalName() }}

        -

        {% trans 'Date' %} : {{ file.getCreated()|date('Y-m-d') }}

        +

        {% trans "Filename" %} : {{ file.getOriginalName() }}

        +

        {% trans "Date" %} : {{ file.getCreated() | prettyDate }}

        {% if file.getSession().getUser() is not none %} -

        {% trans 'Uploaded by' %} : {{ file.getSession().getUser().get_login() }}

        +

        + {% set username = '' ~ file.getSession().getUser().get_display_name() ~ '' %} + {% trans %} + Uploaded by : {{ username }} + {% endtrans %} +

        {% endif %} -

        {% trans 'Collection' %} : {{ file.getCollection().get_name() }}

        +

        {% trans "Collection" %} : {{ file.getCollection().get_name() }}

        -
        - - {% if records|length > 0 %} - {% endif %}
        -
        • +
      {# Store lazaret file id in hidden input #} {# Store lazaret file destination #} -
      +
    {% set record_count = records|length %} {% if record_count > 0 %} -
    -

    -

    - {% trans %} - {{ record_count }} record match the unique identifier. - {% plural record_count %} - {{ record_count }} records match the unique identifier. - {% endtrans %} -
    -

    +
    +
    + {% trans %} + {{ record_count }} record match the unique identifier : + {% plural record_count %} + {{ record_count }} records match the unique identifier : + {% endtrans %} +
      {% for record in records %} - {% if user.ACL().has_right_on_base(record.get_base_id(), 'canaddrecord') - and user.ACL().has_right_on_base(record.get_base_id(), 'candeleterecord') %} -
    • -
      - {% if user.ACL().has_access_to_subdef(record, 'preview') %} + {% if user.ACL().has_right_on_base(record.get_base_id(), "canaddrecord") + and user.ACL().has_right_on_base(record.get_base_id(), "candeleterecord") %} +
    • +
      + {% if user.ACL().has_access_to_subdef(record, "preview") %} {% set preview_obj = record.get_preview() %} {% else %} {% set preview_obj = record.get_thumbnail() %} {% endif %} - -
      - {{ thumb.format(preview_obj, 260, 180, '', session, false) }} +
      + {{ thumb.format(preview_obj, 260, 180, "", session, false) }}
      -

      {{ record.get_title() }}

      +

      {{ record.get_title() }}

      • diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig index 15e5df20fc..aca9d560ca 100644 --- a/templates/web/prod/upload/upload.html.twig +++ b/templates/web/prod/upload/upload.html.twig @@ -30,8 +30,9 @@ {% trans 'Select files...' %} - - ( {% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %}) +
      + + ({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %}) {# #}
    @@ -111,9 +112,7 @@
    {# download box #} -
    - -
    +
    @@ -144,6 +143,11 @@ $(document).ready(function () { $(".upload-tabs", UploaderManager.getContainer()).tabs({ spinner: language.loading + '', ajaxOptions: { + success: function( xhr, status, index, anchor ) { + var lazaretBox = $("#lazaretBox"); + + $('.userTips', lazaretBox).tooltip(); + }, error: function( xhr, status, index, anchor ) { //display error message if ajax failed $( anchor.hash ).html(language.error); diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 75514701ec..7b1f08b5b3 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -3920,16 +3920,26 @@ dans l'onglet thesaurus : arbres, menus contextuels /** UPLOAD MANAGER */ +#uploadBox { + height: 100%; +} + #uploadBox .clear { clear: both; } -#uploadBox #tab-upload { - padding: 10px; +#uploadBox .upload-tabs { + height: 100%; +} + +#uploadBox #tab-upload, +#uploadBox #tab-lazaret { + height: 90%; + padding: 20px; } #uploadBoxLeft, #uploadBoxRight { - width: 48%; + width: 48.5%; height: 100%; overflow: auto; text-align: center; @@ -3949,6 +3959,10 @@ dans l'onglet thesaurus : arbres, menus contextuels color: #333333; } +#uploadBox #fileupload { + height: 97%; +} + #uploadBox h5 { margin-top: 20px; margin-bottom: 10px; @@ -3957,6 +3971,11 @@ dans l'onglet thesaurus : arbres, menus contextuels text-align: left; } +#uploadBox span.comment { + font-style: italic; + color: #999999; +} + #uploadBox button.btn, #uploadBox span.btn { font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 12px; @@ -4037,38 +4056,65 @@ dans l'onglet thesaurus : arbres, menus contextuels margin-right: 5px; } -#uploadBox .upload-record { - height: 260px; +#uploadBox .thumbnails { + margin-left: -20px; +} + +#uploadBox .thumbnails > li { + margin-left: 20px; } #uploadBox .upload-record { height: 260px; + background-color: #FFFFFF; } #uploadBox .upload-record .canva-wrapper { height: 120px; } +@media (min-width: 768px) and (max-width: 979px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 94px; + } +} + +@media (min-width: 980px) and (max-width: 1199px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 130px; + } +} + +@media (min-width: 1200px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 160px; + } +} + #uploadBox .upload-record .name-doc { - font-weight: bold; height:40px; overflow: hidden; -o-text-overflow: ellipsis; /* pour Opera 9 */ text-overflow: ellipsis; + font-weight: bold; } #uploadBox .upload-record .infos-doc { color: #777777; - height:40px; + height: 40px; } #uploadBox .upload-record .error, #uploadBox .upload-record .success{ - height:60px; - display:none; - overflow:auto; + height: 55px; + padding-top: 2px; + padding-bottom: 3px; + display: none; + overflow: auto; } - #uploadBox .upload-record .remove-element { margin: 2px 0; } @@ -4090,7 +4136,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #uploadBoxRight .progress { margin-top: 4px; - margin-bottom: 4px; + margin-bottom: 10px; height: 10px; } @@ -4104,3 +4150,76 @@ dans l'onglet thesaurus : arbres, menus contextuels background-repeat: no-repeat; } +#lazaretBox.container-fluid { + margin: 0; + padding: 0; +} + +#lazaretBox li.wrapper-item { + margin-bottom: 20px; +} + +#lazaretBox .lazaret-file h5, +#lazaretBox .lazaret-proposals h5 { + margin-top: 0; + margin-bottom: 10px; +} + +#lazaretBox .lazaret-file p, +#lazaretBox .lazaret-proposals p { + font-weight: bold; +} + +#lazaretBox span.info { + display: inline; + font-weight: normal; +} + +#lazaretBox .lazaret-file a, +#lazaretBox .lazaret-proposals a { + font-weight: normal; + color: #333333; +} + +#lazaretBox .lazaret-file a:hover, +#lazaretBox .lazaret-proposals a:hover { + color: #999999; +} + +#lazaretBox .lazaret-file .thumbnails, +#lazaretBox .lazaret-proposals .thumbnails { + margin-left: 0; +} + +#lazaretBox .lazaret-file .thumbnails li { + margin: 0; +} + +#lazaretBox .lazaret-proposals .records-subititution { + margin: 0 10px 10px 0; +} + +#lazaretBox .lazaret-file .thumbnail, +#lazaretBox .lazaret-proposals .thumbnail { + background-color: #FFFFFF; +} + +#lazaretBox .lazaret-proposals .thumbnail { + min-height: 234px; +} + +#lazaretBox .lazaret-proposals .thumbnail .record-thumb { + height: 180px; +} + +#lazaretBox .lazaret-file .thumbnail img { + max-height: 480px; +} + +#lazaretBox .lazaret-file .thumbnail button { + font-weight: normal; +} + +#lazaretBox .lazaret-file .thumbnail button img { + margin-right: 5px; +} diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 559197a02f..ca7a06d9e7 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -4041,12 +4041,22 @@ dans l'onglet thesaurus : arbres, menus contextuels /** UPLOAD MANAGER */ +#uploadBox { + height: 100%; +} + #uploadBox .clear { clear: both; } -#uploadBox #tab-upload { - padding: 10px; +#uploadBox .upload-tabs { + height: 100%; +} + +#uploadBox #tab-upload, +#uploadBox #tab-lazaret { + height: 90%; + padding: 20px; } #uploadBoxLeft, #uploadBoxRight { @@ -4070,6 +4080,10 @@ dans l'onglet thesaurus : arbres, menus contextuels color: #333333; } +#uploadBox #fileupload { + height: 97%; +} + #uploadBox h5 { margin-top: 20px; margin-bottom: 10px; @@ -4078,6 +4092,11 @@ dans l'onglet thesaurus : arbres, menus contextuels text-align: left; } +#uploadBox span.comment { + font-style: italic; + color: #999999; +} + #uploadBox button.btn, #uploadBox span.btn { font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 12px; @@ -4158,35 +4177,63 @@ dans l'onglet thesaurus : arbres, menus contextuels margin-right: 5px; } -#uploadBox .upload-record { - height: 260px; +#uploadBox .thumbnails { + margin-left: -20px; +} + +#uploadBox .thumbnails > li { + margin-left: 20px; } #uploadBox .upload-record { height: 260px; + background-color: #FFFFFF; } #uploadBox .upload-record .canva-wrapper { height: 120px; } +@media (min-width: 768px) and (max-width: 979px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 94px; + } +} + +@media (min-width: 980px) and (max-width: 1199px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 130px; + } +} + +@media (min-width: 1200px) { + #uploadBox .upload-record canvas { + max-height: 120px; + width: 160px; + } +} + #uploadBox .upload-record .name-doc { - font-weight: bold; - height:40px; + height: 40px; overflow: hidden; -o-text-overflow: ellipsis; /* pour Opera 9 */ text-overflow: ellipsis; + font-weight: bold; } #uploadBox .upload-record .infos-doc { color: #777777; - height:40px; + height: 40px; } #uploadBox .upload-record .error, #uploadBox .upload-record .success{ - height:60px; - display:none; - overflow:auto; + height: 55px; + padding-top: 2px; + padding-bottom: 3px; + display: none; + overflow: auto; } #uploadBox .upload-record .remove-element { @@ -4210,7 +4257,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #uploadBoxRight .progress { margin-top: 4px; - margin-bottom: 4px; + margin-bottom: 10px; height: 10px; } @@ -4224,3 +4271,78 @@ dans l'onglet thesaurus : arbres, menus contextuels background-repeat: no-repeat; } +#lazaretBox.container-fluid { + margin: 0; + padding: 0; +} + +#lazaretBox li.wrapper-item { + width: 99%; + margin-bottom: 20px; +} + +#lazaretBox .lazaret-file h5, +#lazaretBox .lazaret-proposals h5 { + margin-top: 0; + margin-bottom: 10px; +} + +#lazaretBox .lazaret-file p, +#lazaretBox .lazaret-proposals p { + font-weight: bold; +} + +#lazaretBox span.info { + display: inline; + font-weight: normal; +} + +#lazaretBox .lazaret-file a, +#lazaretBox .lazaret-proposals a { + font-weight: normal; + color: #333333; +} + +#lazaretBox .lazaret-file a:hover, +#lazaretBox .lazaret-proposals a:hover { + color: #999999; +} + + +#lazaretBox .lazaret-file .thumbnails, +#lazaretBox .lazaret-proposals .thumbnails { + margin-left: 0; +} + +#lazaretBox .lazaret-file .thumbnails li { + margin: 0; +} + +#lazaretBox .lazaret-proposals .records-subititution { + margin: 0 10px 10px 0; +} + +#lazaretBox .lazaret-file .thumbnail, +#lazaretBox .lazaret-proposals .thumbnail { + background-color: #FFFFFF; +} + +#lazaretBox .lazaret-proposals .thumbnail { + min-height: 234px; +} + +#lazaretBox .lazaret-proposals .thumbnail .record-thumb { + height: 180px; +} + +#lazaretBox .lazaret-file .thumbnail img { + max-height: 480px; +} + +#lazaretBox .lazaret-file .thumbnail button { + font-weight: normal; +} + +#lazaretBox .lazaret-file .thumbnail button img { + margin-right: 5px; +}