From 6293f94715ae3cdbdd6400d286f92652926fcb84 Mon Sep 17 00:00:00 2001 From: Ysolyne Gresille Date: Thu, 24 May 2012 18:30:05 +0200 Subject: [PATCH] View bug fixes --- templates/web/common/dialog_export.twig | 1246 +++++++++-------- templates/web/prod/Tooltip/Tooltip.html.twig | 2 +- .../prod/actions/printer_default.html.twig | 84 +- templates/web/prod/index.html.twig | 41 +- templates/web/prod/results/record.html | 2 +- www/prod/docfunction.php | 16 +- www/prod/jquery.Upload.js | 4 + www/skins/prod/000000/prodcolor.css | 137 +- www/skins/prod/959595/prodcolor.css | 198 ++- 9 files changed, 1009 insertions(+), 721 deletions(-) diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig index d5cb120dd1..acc0a4caed 100644 --- a/templates/web/common/dialog_export.twig +++ b/templates/web/common/dialog_export.twig @@ -1,645 +1,661 @@ {% import 'common/thumbnail.html' as thumbnail %} - {% macro print_ftp_form(datas) %}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - - -
- - - -
-
-{% endmacro %} -{% macro choose_title(id, choose_export_title, default_export_title)%} -
- {% trans 'Nom des fichiers a l\'export'%} - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + + +
+ + + +
+ {% endmacro %} +{% macro choose_title(id, choose_export_title, default_export_title)%} +
+

{% trans 'Nom des fichiers a l\'export'%}

+
+ + +
+
+{% endmacro %} {% if download.get_total_download() <= 0 and download.get_total_order() <= 0 and download.get_total_ftp() <= 0%} -
- {% trans 'Les documents ne peuvent pas etre exportes' %}
- -
+
+

{% trans 'Les documents ne peuvent pas etre exportes' %}

+ +
{% endif %} +
- -
+
    {% if download.get_total_download() > 0 %} -
    -
    -

    {% trans 'export:: telechargement' %}

    -
    - - - {% for name, values in download.get_display_download() %} - {% if values.available > 0 %} -
    - - - - - {% set title%} - {% trans 'Documents indisponibles' %} - {% endset %} - {% if values.refused|length > 0 %} - + - - {% endif %} -
    - {% endif %} - {% endfor %} - {% if download.has_business_fields_access() %} - - {% endif %} - {{ _self.choose_title('download', choose_export_title, default_export_title) }} -
    - - -
    -
    -
    -
    -
    -
    -

    {% trans 'export:: envoi par mail' %}

    -
    - - -
    - {% trans 'export::mail: destinataire' %} - - {% set my_email = user.get_email() %} - {% if my_email != '' %} - - {% trans %}Recevoir un accuse de reception a {{my_email}}{% endtrans %} - {% else %} - {% trans 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' %} - - {% endif %} -
    - {% trans 'Entrez plusieurs adresses email en les separant par des points-virgules' %} -
    -
    -

    {% trans 'export::mail: contenu du mail' %}

    - -
    -
    -

    {% trans 'export::mail: fichiers joint' %}

    - {% for name, values in download.get_display_download() %} - {% if values.available > 0 %} -
    - - - {% set title%} - {% trans 'Documents indisponibles' %} - {% endset %} - {% if values.refused|length > 0 %} - + - - {% endif %} -
    - {% endif %} - {% endfor %} -
    - {% if download.has_business_fields_access() %} - - {% endif %} - {{ _self.choose_title('sendmail', choose_export_title, default_export_title) }} -
    - - - -
    -
    - -
    -
    +
  • {% trans 'export:: telechargement' %}
    • +
  • {% trans 'export:: envoi par mail' %}
    • {% endif %} {% if download.get_total_order() > 0 %} -
    -
    -

    {% trans 'export::commande: bon de commande' %}

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - {% trans 'commande::utilisation prevue' %} - - -
    - {% trans 'commande::deadline' %} - - -
    - - -
    - {% trans 'admin::compte-utilisateur nom' %} * - - -
    - {% trans 'admin::compte-utilisateur prenom' %} * - - -
    - {% trans 'admin::compte-utilisateur email' %} * - - -
    - {% trans 'admin::compte-utilisateur telephone' %} - - -
    - {% trans 'admin::compte-utilisateur societe' %} - - -
    - {% trans 'admin::compte-utilisateur poste' %} - - -
    - {% trans 'admin::compte-utilisateur adresse' %} * - - -
    - {% trans 'admin::compte-utilisateur code postal' %} * - - -
    - {% trans 'admin::compte-utilisateur ville' %} * - - -
    - {% trans 'admin::compte-utilisateur fax' %} - - -
    -
    - {% for name, values in download.get_display_orderable() %} - {% if values.available > 0 %} -
    - {% set docs_orderable = values.available %} - {% trans %}{{docs_orderable}} documents commandes{% endtrans %} - {% set docs_not_orderable = values.total - values.available %} - {% if docs_not_orderable > 0%} - {% trans %}{{docs_not_orderable}} documents ne peuvent pas etre commandes{% endtrans %} - {% endif %} - {% set title%} - {% trans 'Documents indisponibles' %} - {% endset %} - {% if values.refused|length > 0 %} - + - - {% endif %} -
    - {% endif %} - {% endfor %} -
    -
    - - - -
    -
    -
    -
    +
  • {% trans 'export:: commande' %}
    • {% endif %} {% if download.get_total_ftp() > 0 %} - -
    -
    -

    {% trans 'export:: FTP' %}

    -
    - - -
    - {% trans 'phraseanet:: prereglages'%} - -
    -
    -
    - {% for datas in download.get_ftp_datas() %} - {{ _self.print_ftp_form(datas) }} - {% endfor %} -
    -
    -
    -

    {% trans 'export::mail: fichiers joint' %}

    - {% for name, values in download.get_display_ftp() %} +
  • {% trans 'export:: FTP' %}
    • + {% endif %} +
+
+ {% if download.get_total_download() > 0 %} +
+
+

{% trans 'export:: telechargement' %}

+ + + + {% for name, values in download.get_display_download() %} {% if values.available > 0 %} -
- - +
+ {% set title%} {% trans 'Documents indisponibles' %} {% endset %} {% if values.refused|length > 0 %} - + - + + + {% endif %} -
+
{% endif %} {% endfor %} -
- {% if download.has_business_fields_access() %} - - {% endif %} -
- - - - - -
- -
-
- + {% endif %} +
+ + - {% endif %} -
- - diff --git a/templates/web/prod/Tooltip/Tooltip.html.twig b/templates/web/prod/Tooltip/Tooltip.html.twig index ec1fc1d856..95eb856df5 100644 --- a/templates/web/prod/Tooltip/Tooltip.html.twig +++ b/templates/web/prod/Tooltip/Tooltip.html.twig @@ -3,7 +3,7 @@

{% if title %} - {{ title }} + {{ title }} {% endif %}

diff --git a/templates/web/prod/actions/printer_default.html.twig b/templates/web/prod/actions/printer_default.html.twig index 1d07e012cc..2f84799216 100644 --- a/templates/web/prod/actions/printer_default.html.twig +++ b/templates/web/prod/actions/printer_default.html.twig @@ -1,43 +1,47 @@
- - {% if printer.get_count_actionable() > 0 %} - {% if printer.get_count_preview() > 0 %} - - {% trans 'phraseanet:: preview' %}
- -
- -
- -
- -

- {% endif %} - {% if printer.get_count_thumbnail() > 0 %} - - {% trans 'print:: imagette' %}
- -
- -
- - {% endif %} - {% elseif printer.get_count_element_received() > 0 %} - {% trans 'None of the selected records can be printed ' %} - {% else %} - {% trans 'export:: erreur : aucun document selectionne' %} - {% endif %} - - +
+
+ {% if printer.get_count_actionable() > 0 %} + {% if printer.get_count_preview() > 0 %} +

{% trans 'phraseanet:: preview' %}

+
+ + + +
+ {% endif %} + {% if printer.get_count_thumbnail() > 0 %} +

{% trans 'print:: imagette' %}

+
+ + +
+ {% endif %} + {% elseif printer.get_count_element_received() > 0 %} + {% trans 'None of the selected records can be printed' %} + {% else %} + {% trans 'export:: erreur : aucun document selectionne' %} + {% endif %} +
+ + +
+
+
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 68b7734542..98645315c7 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -376,23 +376,30 @@ -
- {% if GV_multiAndReport %} - - - {% else %} - - {% endif %} - +
+
+ {% if GV_multiAndReport %} + + + {% else %} + + {% endif %} + +
- @@ -545,7 +552,7 @@
-
+
diff --git a/templates/web/prod/results/record.html b/templates/web/prod/results/record.html index bd76281f65..a81f8e5a31 100644 --- a/templates/web/prod/results/record.html +++ b/templates/web/prod/results/record.html @@ -21,7 +21,7 @@ onDblClick="openPreview('RESULT',{{record.get_number}});"> {% endif %}
-
+
{{record.get_title(highlight, searchEngine)|raw}}
diff --git a/www/prod/docfunction.php b/www/prod/docfunction.php index 5af8ff037f..266b040713 100644 --- a/www/prod/docfunction.php +++ b/www/prod/docfunction.php @@ -459,9 +459,9 @@ if ($sbasSet !== null) { " /> -
- - +
+ +
@@ -517,8 +517,8 @@ foreach ($types as $sbas_id => $typeBR) { echo '
Record ' . $rec2[1] . "
"; $thumbnail = $record->get_thumbnail(); - echo '
'; - echo '
' . $select . '
'; + echo '
'; + echo '
' . $select . '
'; flush(); } } @@ -528,9 +528,9 @@ foreach ($types as $sbas_id => $typeBR) { ?> -
- - +
+ +
diff --git a/www/prod/jquery.Upload.js b/www/prod/jquery.Upload.js index f524ac41b5..77c4f976a2 100644 --- a/www/prod/jquery.Upload.js +++ b/www/prod/jquery.Upload.js @@ -47,6 +47,10 @@ var p4 = p4 || {}; this.options.uploadBox = this.options.uploadBox.find('ul:first'); + this.options.downloadBox.wrapInner('
    '); + + this.options.downloadBox = this.options.downloadBox.find('ul:first'); + if($.isFunction($.fn.sortable)){ this.options.uploadBox.sortable(); } diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 17a86c25ff..dc7e8c3ee7 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -460,6 +460,13 @@ span.ww_winTitle { color: #FFFFFF; } +#searchForm label { + color: #FFFFFF; +} + +#searchForm #recordtype_sel { + margin-left: 10px; +} /** PRESENTATION DE MINIATURES **/ @@ -1719,18 +1726,18 @@ H4 { /** BOITES MODALES **/ .bodyprofile { - background-color:transparent; - color:#404040; + background-color: transparent; + color: #404040; } .bodyprofile .ui-tabs .ui-tabs-panel { - background-color:#a3a3a3; - color:#404040; + background-color: #a3a3a3; + color: #333333; } .bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-selected { - background-color:#a3a3a3; - color:#404040; + background-color: #a3a3a3; + color: #404040; } .bodyprofile .ui-tabs li.ui-state-active a, @@ -1851,6 +1858,73 @@ H4 { +/** EXPORT **/ + +#printBox { + background-color: #404040; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + +#printBox h4, +#download h4, +#sendmail h4 { + margin-bottom: 10px; + font-weight: bold; + font-size: 14px; + line-height: 18px; + color: #FFFFFF; + text-decoration: none; +} + +#printBox label, +#download label, +#sendmail label { + line-height: 18px; + color: #FFFFFF; +} + +#sendmail p, +.buttons_line p { + margin: 20px 0 10px 0; + font-weight: bold; +} + +#printBox .btn, +#download .btn, +#sendmail .btn { + font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 12px; + font-weight: bold; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} + +#printBox .btn-inverse, +#download .btn-inverse, +#sendmail .btn-inverse { + *background-color: #393939; + background-image: -ms-linear-gradient(top, #444444, #393939); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939)); + background-image: -webkit-linear-gradient(top, #444444, #393939); + background-image: -o-linear-gradient(top, #444444, #393939); + background-image: -moz-linear-gradient(top, #444444, #393939); + background-image: linear-gradient(top, #444444, #393939); + /*border: 1px solid #515151;*/ + color: #AAAAAA; +} + +#printBox .btn-inverse:hover, +#download .btn-inverse:hover, +#sendmail .btn-inverse:hover { + background-color: #393939; + *background-color: #393939; + color: #FFFFFF; +} + +/** **/ @@ -2467,6 +2541,57 @@ DIV.thesaurus U.w { color: #FFFFFF; } +.edit-btn { + margin: 2px; + font-weight: bold; + font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; + display: inline-block; + *display: inline; + font-size: 13px; + line-height: 18px; + *line-height: 20px; + color: #EAEAEA; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + vertical-align: middle; + cursor: pointer; + background-color: #B1B1B1; + *background-color: #B1B1B1; + background-image: -ms-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B9B9B9), to(#A4A4A4)); + background-image: -webkit-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -o-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -moz-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: linear-gradient(top, #B9B9B9, #A4A4A4); + background-repeat: repeat-x; + border: 1px solid #cccccc; + *border: 0; + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#B9B9B9', endColorstr='#A4A4A4', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + *zoom: 1; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.edit-btn:hover { + background-color: #A4A4A4; + *background-color: #A4A4A4; + color: #FFFFFF; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -ms-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} + + #EDIT_WORKING { position: absolute; top: 100px; diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index d5416e6a40..bad2bdf40b 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -478,6 +478,13 @@ span.ww_winTitle { color: #FFFFFF; } +#searchForm label { + color: #FFFFFF; +} + +#searchForm #recordtype_sel { + margin-left: 10px; +} /*PRESENTATION DE MINIATURES*/ @@ -1745,47 +1752,47 @@ H4 -/** -BOITES MODALES -**/ +/** BOITES MODALES **/ -.bodyprofile{ - background-color:transparent; - color:#B1B1B1; +.bodyprofile { + background-color: transparent; + color: #FFFFFF; } -.bodyprofile .ui-tabs .ui-tabs-panel -{ - background-color:#a3a3a3; - color:#B1B1B1; + +.bodyprofile .ui-tabs .ui-tabs-panel { + background-color: #a3a3a3; + color: #333333; } -.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-selected -{ - background-color:#a3a3a3; - color:#B1B1B1; + +.bodyprofile .ui-tabs .ui-tabs-nav li.ui-tabs-selected { + background-color: #a3a3a3; + color: #FFFFFF; } + .bodyprofile .ui-tabs li.ui-state-active a, -.ui-state-active a:link, .ui-state-active a:visited -{ - color:#B1B1B1; +.ui-state-active a:link, .ui-state-active a:visited { + color: #FFFFFF; } -.bodyprofile .ui-widget-content -{ - color:#B1B1B1; - background-color:#B1B1B1; + +.bodyprofile .ui-widget-content { + background-color: #666666; + color: #FFFFFF; } -.overlay, .ui-widget-overlay{ - background-color:#B1B1B1; - opacity:0.7; - filter:alpha(opacity=70); + +.overlay, .ui-widget-overlay { + background-color: #B1B1B1; + opacity: 0.7; + filter: alpha(opacity=70); } -.overlay_box{ - position:absolute; - background-color:#999999; - display:none; - overflow-y:auto; - padding:5px; - max-width:800px; - max-height:400px; + +.overlay_box { + position: absolute; + background-color: #999999; + display: none; + overflow-y: auto; + padding: 5px; + max-width: 800px; + max-height: 400px; } @@ -1890,6 +1897,80 @@ BOITES MODALES +/** EXPORT **/ + +#printBox { + background-color: #B1B1B1; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + +#printBox h4, +#download h4, +#sendmail h4 { + margin-bottom: 10px; + font-weight: bold; + font-size: 14px; + line-height: 18px; + color: #FFFFFF; + text-decoration: none; +} + +#printBox label, +#download label, +#sendmail label { + line-height: 18px; + color: #FFFFFF; +} + +#sendmail p, +.buttons_line p { + margin: 20px 0 10px 0; + font-weight: bold; +} + +#printBox .btn, +#download .btn, +#sendmail .btn { + font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 12px; + font-weight: bold; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} + +#printBox .btn-inverse, +#download .btn-inverse, +#sendmail .btn-inverse { + background-color: #B1B1B1; + *background-color: #B1B1B1; + background-image: -ms-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B9B9B9), to(#A4A4A4)); + background-image: -webkit-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -o-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -moz-linear-gradient(top, #B9B9B9, #A4A4A4); + /*border: 1px solid #666666;*/ + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#B9B9B9', endColorstr='#A4A4A4', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + color: #EAEAEA; +} + +#printBox .btn-inverse:hover, +#download .btn-inverse:hover, +#sendmail .btn-inverse:hover { + background-color: #A4A4A4; + *background-color: #A4A4A4; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + color: #FFFFFF; +} + +/** **/ + + + DIV.finder { WHITE-SPACE: nowrap @@ -2530,6 +2611,57 @@ DIV.thesaurus U.w color: #FFFFFF; } +.edit-btn { + margin: 2px; + font-weight: bold; + font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; + display: inline-block; + *display: inline; + font-size: 13px; + line-height: 18px; + *line-height: 20px; + color: #EAEAEA; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + vertical-align: middle; + cursor: pointer; + background-color: #B1B1B1; + *background-color: #B1B1B1; + background-image: -ms-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B9B9B9), to(#A4A4A4)); + background-image: -webkit-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -o-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: -moz-linear-gradient(top, #B9B9B9, #A4A4A4); + background-image: linear-gradient(top, #B9B9B9, #A4A4A4); + background-repeat: repeat-x; + border: 1px solid #cccccc; + *border: 0; + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#B9B9B9', endColorstr='#A4A4A4', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + *zoom: 1; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.edit-btn:hover { + background-color: #A4A4A4; + *background-color: #A4A4A4; + color: #FFFFFF; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -ms-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} + + #EDIT_WORKING { position: absolute; top: 100px;