From 72592aacfd1728f8d4f4811f194ffb3f6975e0c2 Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 19 Feb 2015 18:46:22 +0000 Subject: [PATCH] expo-91-95 bugs diferent --- .../client/includes/accounts/simple_user.html | 15 +++++-- .../client/includes/company/company_edit.html | 12 ++--- .../includes/company/company_object.html | 45 +++++++++++-------- templates/client/static_client/css/main.css | 2 +- .../client/static_client/css_min/main.min.css | 2 +- 5 files changed, 45 insertions(+), 31 deletions(-) diff --git a/templates/client/includes/accounts/simple_user.html b/templates/client/includes/accounts/simple_user.html index 2d71d955..cc8d77da 100644 --- a/templates/client/includes/accounts/simple_user.html +++ b/templates/client/includes/accounts/simple_user.html @@ -104,10 +104,17 @@
{% trans 'Участие в событиях' %}
- {{ member.get_expositions_number }} в выставках - {{ member.get_conferences_number }} в конференциях - {{ member.get_seminars_number }} в семинарах -
+ {% if member.get_expositions_number > 0 %} + {{ member.get_expositions_number }} в выставках + {% endif %} + {% if member.get_conferences_number > 0 %} + {{ member.get_conferences_number }} в конференциях + {% endif %} + {% if member.get_seminars_number > 0 %} + {{ member.get_seminars_number }} в семинарах + {% endif %} + + diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html index 0c664231..0300e740 100644 --- a/templates/client/includes/company/company_edit.html +++ b/templates/client/includes/company/company_edit.html @@ -203,12 +203,12 @@ {% endwith %}
-
-