From 9ba3beac3d2ba6edaed602968ba40e4c653fd6f0 Mon Sep 17 00:00:00 2001 From: pavel Date: Mon, 30 Mar 2015 12:59:33 +0000 Subject: [PATCH] css bugs --- templates/client/includes/accounts/simple_user.html | 10 +++++----- templates/client/includes/company/company_list.html | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/client/includes/accounts/simple_user.html b/templates/client/includes/accounts/simple_user.html index f7e39411..24a897d8 100644 --- a/templates/client/includes/accounts/simple_user.html +++ b/templates/client/includes/accounts/simple_user.html @@ -18,11 +18,11 @@
-
- {% if member.profile.country %} - {{ member.profile.country }}, {{ member.profile.city }} - {% endif %} -
+ {% if member.profile.country or member.profile.city%} +
+ {% if member.profile.country %}{{ member.profile.country }},{% endif %}{% if member.profile.city %} {{ member.profile.city }}{% endif %} +
+ {% endif %}
{{ member.get_full_name }}
diff --git a/templates/client/includes/company/company_list.html b/templates/client/includes/company/company_list.html index dec449a1..97b4ae5d 100644 --- a/templates/client/includes/company/company_list.html +++ b/templates/client/includes/company/company_list.html @@ -41,13 +41,15 @@ {% if company.get_events %} {% trans 'события' %} ({{ company.get_events_number }}) {% endif %} + {% comment %} {% trans 'заметка' %} + {% endcomment %}
- + {% endcomment %}