From 1fff1faa5d52207d5a200e802a3bcb149d97f1b9 Mon Sep 17 00:00:00 2001 From: Ysolyne Gresille Date: Tue, 29 May 2012 18:20:14 +0200 Subject: [PATCH] bugfixes et updates for skins --- templates/web/common/dialog_export.twig | 190 ++++--- templates/web/prod/Baskets/Reorder.html.twig | 36 +- templates/web/prod/Baskets/Update.html.twig | 74 ++- templates/web/prod/actions/Bridge/index.twig | 150 +++--- .../web/prod/actions/Feedback/list.html.twig | 338 ++++++------ templates/web/prod/actions/Push.html.twig | 483 ++++++++--------- .../web/prod/actions/publish/publish.html | 162 +++--- templates/web/prod/index.html.twig | 3 +- www/prod/docfunction.php | 10 +- www/prod/jquery.Feedback.js | 29 +- www/skins/prod/000000/prodcolor.css | 174 +++++-- www/skins/prod/959595/prodcolor.css | 207 ++++++-- www/skins/prod/Push.css | 490 ++++++++++-------- 13 files changed, 1251 insertions(+), 1095 deletions(-) diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig index acc0a4caed..27e8de089e 100644 --- a/templates/web/common/dialog_export.twig +++ b/templates/web/common/dialog_export.twig @@ -2,81 +2,61 @@ {% macro print_ftp_form(datas) %}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - - -
- - - -
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
{% endmacro %} @@ -170,7 +150,7 @@
-
+
{% trans 'export::mail: destinataire' %} {% set my_email = user.get_email() %} @@ -218,7 +198,7 @@
{% if download.has_business_fields_access() %}
- - + {# SCRIPT - HORIZONTAL TABS #} diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig index 7702155416..b2caedc5cb 100644 --- a/templates/web/prod/actions/Push.html.twig +++ b/templates/web/prod/actions/Push.html.twig @@ -1,274 +1,247 @@
-
-
-
- {% if context == 'Push' %} - - {% else %} - - {% endif %} -
-
-
-

{% trans 'Grant rights' %}

-
    - {% if context == 'Feedback' %} -
  • - -
    • -
  • - -
    • - {% endif %} -
  • - -
    • -
-
- -
-
-
-
-
-
- - - - - - -
-
- -
- {% trans 'Select a user in the list'%}
- {% if user.ACL().has_right('manageusers') %} - {% trans 'or' %} - {% trans 'Add user' %} - {% endif %} -
-

- - {% set recommendation = '' %} - - {% set total = RecommendedUsers|length %} - - {% for user in RecommendedUsers %} - - {% if total <= 4 or loop.index <= 4 %} - {% if recommendation != '' and not loop.last %} - {% set recommendation = recommendation ~ ', ' %} - {% elseif recommendation != '' and loop.last %} - {% set recommendation = recommendation %} - {% endif %} - {% set recommendation = recommendation - ~ ' ' - ~ '' - ~ user.get_display_name() - ~ '' %} - {% endif %} - - {% endfor %} - - {% if total > 4 %} - {% set n = total - 4%} - {% set and_many_more %} - {% trans %} - and {{ n }} more peoples - {% endtrans %} - {% endset %} - {% set recommendation = recommendation - ~ '' - ~ and_many_more ~ '' %} - {% endif %} - - - {% if recommendation != '' %} - {% set recommendation = '
' ~ recommendation %} - {% if context == 'Push' %} - {% trans %} - Please consider send this push to the following users : {{ recommendation }} - {% endtrans %} - {% else %} - {% trans %} - Please consider send this validation to the following users : {{ recommendation }} - {% endtrans %} - {% endif %} - {% endif %} -

- - - 		- -

+

+
+
{% if context == 'Push' %} - {% trans 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' %} + {% else %} - {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %} + {% endif %} -

-
-
-
-
-
-
- - - - - -
- - - -
+
+
+
+

{% trans 'Grant rights' %}

+
    + {% if context == 'Feedback' %} +
  • + +
    • +
  • + +
    • + {% endif %} +
  • + +
    • +
+
+ +
+
+
+
+
+
+ + + + + + +
+
+ +
+ {% trans 'Select a user in the list'%}
+ {% if user.ACL().has_right('manageusers') %} + {% trans 'or' %} + {% trans 'Add user' %} + {% endif %} +
+

+ {% set recommendation = '' %} + {% set total = RecommendedUsers|length %} + + {% for user in RecommendedUsers %} + {% if total <= 4 or loop.index <= 4 %} + {% if recommendation != '' and not loop.last %} + {% set recommendation = recommendation ~ ', ' %} + {% elseif recommendation != '' and loop.last %} + {% set recommendation = recommendation %} + {% endif %} + {% set recommendation = recommendation + ~ ' ' + ~ '' + ~ user.get_display_name() + ~ '' %} + {% endif %} + {% endfor %} + + {% if total > 4 %} + {% set n = total - 4%} + {% set and_many_more %} + {% trans %} + and {{ n }} more peoples + {% endtrans %} + {% endset %} + {% set recommendation = recommendation + ~ '' + ~ and_many_more ~ '' %} + {% endif %} + + {% if recommendation != '' %} + {% set recommendation = '
' ~ recommendation %} + {% if context == 'Push' %} + {% trans %} + Please consider send this push to the following users : {{ recommendation }} + {% endtrans %} + {% else %} + {% trans %} + Please consider send this validation to the following users : {{ recommendation }} + {% endtrans %} + {% endif %} + {% endif %} +

+ + + 		+

+ {% if context == 'Push' %} + {% trans 'Push::unpush permet d\'envoyer un lot d\'image a des destinataires' %} + {% else %} + {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %} + {% endif %} +

+
+
+
+
+
+
+ + + + + +
+ + + +
+
+
+ + + + + + +
+
+
+ +
+
-
- - - - - - -
-
-
-
- -
-
-
+