From a12e03ae635cfdeb35b7a83182f0e51db0e8ac0a Mon Sep 17 00:00:00 2001 From: pavel Date: Fri, 16 Jan 2015 19:27:12 +0000 Subject: [PATCH] expo-33 expo 34 bugs fixed --- .../includes/accounts/current_user.html | 238 ++++++++++-------- templates/client/static_client/css/main.css | 31 ++- .../static_client/js/_modules/page.profile.js | 62 +++-- templates/client/static_client/js/main.js | 26 -- templates/client/static_client/js/vendor.js | 26 -- .../js_min/_modules/page.profile.min.js | 2 +- .../client/static_client/js_min/vendor.min.js | 2 +- 7 files changed, 198 insertions(+), 189 deletions(-) diff --git a/templates/client/includes/accounts/current_user.html b/templates/client/includes/accounts/current_user.html index a8103e63..17a946dd 100644 --- a/templates/client/includes/accounts/current_user.html +++ b/templates/client/includes/accounts/current_user.html @@ -54,7 +54,7 @@ {# country and city #}
{% if home_form.instance.country %} - + {% else %} {% endif %} @@ -62,7 +62,7 @@ {% if home_form.instance.city %} - + {% else %} {% endif %} @@ -143,137 +143,154 @@ {# position #} -
-

- {{ work_form.position.value }} - {% if work_form.work.value %} - {% trans 'в' %} {{ work_form.work.value }} - {% endif %} -

+
-
- {% trans 'редактировать' %} -
-
{% csrf_token %} + +
{# END position #}
-
-
-
    -
  • - {% if social_form.facebook.value %} - - Facebook - - {% else %} - Facebook - {% endif %} -
  • -
  • - {% if social_form.linkedin.value %} - - LinkedIn - - {% else %} - LinkedIn - {% endif %} - -
  • - {% if social_form.vk.value %} - - В контакте - - {% else %} - В контакте - {% endif %} -
  • - -
  • - {% if social_form.twitter.value %} - - Twitter - - {% else %} - Twitter - {% endif %} -
  • -
-
- {% trans 'редактировать' %} -
-
{% csrf_token %} +
+
+
{# contacts #}