diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 00dc64d7f5..17ef9b41cc 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -9,7 +9,7 @@

管理员

@@ -17,9 +17,7 @@ {% if common_members %} {% else %} @@ -36,6 +34,7 @@ {% endif %} {% endif %} +
@@ -67,9 +66,52 @@

暂无

{% endif %}
+ +
+ + {% endblock %} {% block extra_script %} + {% endblock %} diff --git a/media/css/seahub.css b/media/css/seahub.css index dfc93a3b94..7f78620b14 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -395,6 +395,20 @@ h2.repo-history { .org-member-name { vertical-align:middle; } +#user-profile { + width:318px; + position:absolute; + left:365px; + top:50px; + z-index:10; + padding:15px;; + min-height:130px; + border:1px solid #ddd; + background:#fff; + box-shadow: 0 2px 4px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.2); + -moz-box-shadow: 0 2px 4px rgba(0,0,0,0.2); +} #member-add { font-size:13px; padding-left:18px; @@ -410,7 +424,6 @@ h2.repo-history { .user-profile .pic { width:80px; text-align:center; - margin-right:20px; } .user-profile .avatar { border-radius:4px; diff --git a/profile/templates/profile/user_profile.html b/profile/templates/profile/user_profile.html index fb2df0f64d..d18f88fae4 100644 --- a/profile/templates/profile/user_profile.html +++ b/profile/templates/profile/user_profile.html @@ -22,18 +22,21 @@

{{ intro }}

{% endif %} - -
- -
-
-
-
-
-
- -
+ +{% if new_user %} +
+ +
+
+
+
+
+
+ +
+{% endif %} + {% else %}

{{ err_msg }}

@@ -42,9 +45,11 @@ {% endblock %} {% block extra_script %} +{% if new_user %} +{% endif %} {% endblock %} diff --git a/profile/urls.py b/profile/urls.py index 10cf44535f..4e8d42ba0a 100644 --- a/profile/urls.py +++ b/profile/urls.py @@ -4,5 +4,6 @@ urlpatterns = patterns('profile.views', url(r'^list_user/$', 'list_userids', name="list_userids"), url(r'^$', 'edit_profile', name="edit_profile"), url(r'^(?P[^/]+)/$', 'user_profile', name="user_profile"), + url(r'^(?P[^/]+)/get/$', 'get_user_profile', name="get_user_profile"), url(r'^logout/$', 'logout_relay', name="logout_relay"), ) diff --git a/profile/views.py b/profile/views.py index b0d5a09583..cdd6bec72a 100644 --- a/profile/views.py +++ b/profile/views.py @@ -1,4 +1,5 @@ # encoding: utf-8 +import simplejson as json from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 @@ -103,3 +104,36 @@ def user_profile(request, user): 'err_msg': err_msg, }, context_instance=RequestContext(request)) + +def get_user_profile(request, user): + data = { + 'email': user, + 'user_nickname': '', + 'user_intro': '', + 'err_msg': '', + 'new_user': '' + } + content_type = 'application/json; charset=utf-8' + + try: + user_check = ccnet_rpc.get_emailuser(user) + except: + user_check = None + + if user_check: + profile = Profile.objects.filter(user=user) + if profile: + profile = profile[0] + data['user_nickname'] = profile.nickname + data['user_intro'] = profile.intro + else: + data['err_msg'] = '该用户不存在' + + if user == request.user.username or \ + Contact.objects.filter(user_email=request.user.username, + contact_email=user).count() > 0: + data['new_user'] = False + else: + data['new_user'] = True + + return HttpResponse(json.dumps(data), content_type=content_type)