From 5eba73832a5802c24666a4987e4b2fa589f1f010 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Tue, 4 Sep 2012 16:13:06 +0800
Subject: [PATCH] [user_profile]extracted user_profile popup code and included
 them in grp_info,org_info,public_home

---
 contacts/views.py                             |  8 +-
 group/templates/group/group_info.html         | 98 +------------------
 media/css/seahub.css                          | 11 +--
 .../templates/organizations/org_info.html     | 12 ++-
 templates/public_home.html                    | 15 ++-
 templates/repo.html                           |  4 +-
 templates/snippets/user_profile_html.html     | 40 ++++++++
 templates/snippets/user_profile_js.html       | 50 ++++++++++
 8 files changed, 124 insertions(+), 114 deletions(-)
 create mode 100644 templates/snippets/user_profile_html.html
 create mode 100644 templates/snippets/user_profile_js.html

diff --git a/contacts/views.py b/contacts/views.py
index 69b10e5a56..b8b37a3c98 100644
--- a/contacts/views.py
+++ b/contacts/views.py
@@ -63,12 +63,6 @@ def contact_add(request):
     if request.method != 'POST':
         raise Http404
     
-    group_id = request.GET.get('group_id', '0')
-    try:
-        group_id_int = int(group_id)
-    except ValueError:
-        return render_error('小组ID必须为整数')
-        
     form = ContactAddForm(request.POST)
     if form.is_valid():
         contact_email = form.cleaned_data['contact_email']
@@ -83,7 +77,7 @@ def contact_add(request):
         messages.success(request, u"您已成功添加 %s 为联系人" % contact_email)
     else:
         messages.error(request, '操作失败')
-    return HttpResponseRedirect(reverse("group_info", args=(group_id,)))
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
 
 @login_required
 def contact_edit(request):
diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index d056a43c18..0860663d5b 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -20,7 +20,7 @@
 <h3>管理员</h3>
 <ul>
 {% for member in managers %}
-    <li class="group-member">{% avatar member.user_name 16 %}<a class="group-member-name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
+    <li class="member">{% avatar member.user_name 16 %}<a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
 {% endfor %}
 </ul>
 
@@ -28,7 +28,7 @@
 {% if common_members %}
 <ul>
     {% for member in common_members %}
-    <li class="group-member">{% avatar member.user_name 16 %}<a class="group-member-name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
+    <li class="member">{% avatar member.user_name 16 %}<a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
     {% endfor %}
 </ul>
 {% else %}
@@ -148,53 +148,13 @@
 </div>
 </div>
 
-<div id="user-profile" class="user-profile ovhd hide"></div>
-<textarea id="jtemplate" class="hide">
-{#if !$T.err_msg}
-<div class="pic fleft">
-    <img class="avatar" width="80" height="80" alt="{$T.email}" />
-    {#if $T.new_user}
-    <button id="add-as-contact">加为联系人</button>
-    {#/if}
-</div>
-
-<div class="txt fright">
-    {#if $T.user_nickname}
-    <p>{$T.user_nickname}</p>
-    {#/if}
-
-    <p>{$T.email}</p>
-
-    {#if $T.user_intro}
-    <p class="intro">{$T.user_intro}</p>
-    {#/if}
-</div>
-
-{#if $T.new_user}
-<form id="add-as-contact-form" class="hide" action="{{ SITE_ROOT }}contacts/add/?group_id={{ group.id }}" method="post">
-    <input type="hidden" name="user_email" value="{{ request.user.username }}" id="id_user_email" />
-    <label>邮箱：</label><br />
-    <input id="id_contact_email" type="text" name="contact_email" maxlength="255" value="{$T.email}" /><br />
-    <label>名字(可选)：</label><br />
-    <input id="id_contact_name" type="text" name="contact_name" maxlength="255" /><br />
-    <label>备注(可选)：</label><br />
-    <input id="id_note" type="text" name="note" maxlength="255" /><br />
-    <input type="submit" value="提交"  class="submit" />
-</form>
-{#/if}
-
-{#else}
-<p class="error">{$T.err_msg}</p>
-{#/if}
-
-</textarea>
-
+{% include "snippets/user_profile_html.html" %}
 {% include "snippets/repo_create_form.html" %}
 
 {% endblock %}
 
 {% block extra_script %}
-<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-jtemplates.js"></script>
+{% include 'snippets/user_profile_js.html' %}
 <script type="text/javascript">
 addConfirmTo($('#quit-group'), '确定要退出？');
 addConfirmTo($('.cancel-share'), '确定要取消共享该目录？');
@@ -222,59 +182,11 @@ $('.download').click(function() {
     window.open($(this).attr('data'));
 });
 
-//show profile when mouse over
-var Hide_profile = '';
-$('.group-member').hover(
-    function() {
-        var this_top = $(this).offset().top - $('#main').offset().top;
-        $(this).css('background', '#eee');
-        var avatar_url = $(this).children('.avatar').attr('src'),
-            avatar_url_array = avatar_url.split('/');
-        if (avatar_url_array[avatar_url_array.length-2] == 16) {//not default avatar
-            avatar_url_array[avatar_url_array.length-2] = 80;//choose avatar size 
-            avatar_url = avatar_url_array.join('/');
-        }
-        $.ajax({
-            url: $(this).children('.group-member-name').attr('href') + 'get/',
-            dataType: 'json',
-            contentType: 'application/json; charset=utf-8',
-            success: function(data) {
-                $('#user-profile').setTemplateElement('jtemplate').processTemplate(data);
-                $('#user-profile .avatar').attr('src', avatar_url);
-                $('#user-profile').removeClass('hide');
-                $('#main').css('position', 'relative');
-                $('#add-as-contact').click(function() {
-                    //$('#add-as-contact-form').modal({appendTo: '#main'});
-                    $('#add-as-contact-form')[0].submit();
-                });
-                if (this_top + $('#user-profile').height() < $('#main').height()) {
-                    $('#user-profile').css('top', this_top - 10);
-                } else {
-                    $('#user-profile').css('top', $('#main').height() - $('#user-profile').height() - 5);
-                }
-            }
-        });
-        clearTimeout(Hide_profile);
-    },
-    function() {
-        $(this).css('background', '#fff');
-        Hide_profile = setTimeout(function() { $('#user-profile').addClass('hide'); }, 1000);
-    }
-);
-
-$('#user-profile').hover(
-    function() {
-        clearTimeout(Hide_profile);
-    },
-    function() {
-        $(this).addClass('hide');
-    }
-);
 {% include 'group/msg_reply_js.html' %}
 
 {% url 'create_group_repo' group.id as repo_create_url %}
 {% with post_url=repo_create_url %}
-{% include 'snippets/repo_create_js.html' %}
+    {% include 'snippets/repo_create_js.html' %}
 {% endwith %}
 </script>
 {% endblock %}
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 7cc5a49474..f601c87a24 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -742,19 +742,16 @@ ul.with-bg li {
     width:5em;
     color:#666;
 }
-.group-member {
+.member {
     _height:21px;
 }
-.group-member .avatar,
-.org-member .avatar {
+.member .avatar {
 	border-radius: 2px;
 	-moz-border-radius: 2px;
 	margin-right: 5px;
 }
-.group-member .avatar,
-.group-member-name,
-.org-member .avatar,
-.org-member-name {
+.member .avatar,
+.member .name {
 	vertical-align:middle;
 }
 #user-profile {
diff --git a/organizations/templates/organizations/org_info.html b/organizations/templates/organizations/org_info.html
index add9ae2eec..2bd13b35fd 100644
--- a/organizations/templates/organizations/org_info.html
+++ b/organizations/templates/organizations/org_info.html
@@ -5,12 +5,20 @@
 {% block nav_org_class %}class="cur"{% endblock %}
 
 {% block main_panel %}
+{% if messages %}
+<ul class="messages hide">
+  {% for message in messages %}
+  <li class="info">{{ message }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+
 <div class="side fright">
 <h3>团体成员</h3>
 {% if org_users %}
 <ul>
     {% for member in org_users %}
-	<li class="org-member">{% avatar member.email 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li>
+	<li class="member">{% avatar member.email 16 %}<a class="name" href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></li>
     {% endfor %}
 </ul>
 {% else %}
@@ -64,10 +72,12 @@
 
 {% include "snippets/repo_share_form.html" %}
 {% include "snippets/repo_create_form.html" %}
+{% include "snippets/user_profile_html.html" %}
 
 {% endblock %}
 
 {% block extra_script %}
+{% include "snippets/user_profile_js.html" %}
 <script type="text/javascript">
 {% include "snippets/myhome_extra_script.html" %}
 
diff --git a/templates/public_home.html b/templates/public_home.html
index 52779de611..07d6a9a06a 100644
--- a/templates/public_home.html
+++ b/templates/public_home.html
@@ -5,12 +5,20 @@
 {% block nav_publichome_class %}class="cur"{% endblock %}
 
 {% block main_panel %}
+{% if messages %}
+<ul class="messages hide">
+  {% for message in messages %}
+  <li class="info">{{ message }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+
 <div class="side fright">
 <h3>成员</h3>
 {% if users %}
 <ul>
     {% for member in users %}
-	<li class="org-member">{% avatar member.email 16 %}<span class="org-member-name"><a href="{% url 'user_profile' member.email %}">{{ member.email|email2nickname }}</a></span></li>
+	<li class="member">{% avatar member.email 16 %}<a class="name" href="{% url 'user_profile' member.email %}">{{ member.email|email2nickname }}</a></li>
     {% endfor %}
 </ul>
 {% else %}
@@ -52,16 +60,17 @@
 
 {% include "snippets/repo_share_form.html" %}
 {% include "snippets/repo_create_form.html" %}
+{% include "snippets/user_profile_html.html" %}
 
 {% endblock %}
 
 {% block extra_script %}
+{% include "snippets/user_profile_js.html" %}
 <script type="text/javascript">
 {% include "snippets/myhome_extra_script.html" %}
-
 {% url 'seahub.views.public_repo_create' as repo_create_url %}
 {% with post_url=repo_create_url %}
-{% include "snippets/repo_create_js.html" %}
+    {% include "snippets/repo_create_js.html" %}
 {% endwith %}
 </script>
 {% endblock %}
diff --git a/templates/repo.html b/templates/repo.html
index 222c0d5452..08ed326e31 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -13,7 +13,7 @@
 {% endif %}
 {% endblock %}
 
-{% block right_panel %}
+{% block main_panel %}
 {% if messages %}
 {% autoescape off %}
 <ul class="messages hide">
@@ -23,9 +23,7 @@
 </ul>
 {% endautoescape %}
 {% endif %}
-{% endblock %}
 
-{% block main_panel %}
   {% if view_history %}
     <h2>{{repo.props.name}} 历史浏览<span class="latest-commit-time-author">({{ current_commit.props.ctime|tsstr_sec }})</span></h2>
   {% else %}
diff --git a/templates/snippets/user_profile_html.html b/templates/snippets/user_profile_html.html
new file mode 100644
index 0000000000..60e9db1bba
--- /dev/null
+++ b/templates/snippets/user_profile_html.html
@@ -0,0 +1,40 @@
+<div id="user-profile" class="user-profile ovhd hide"></div>
+<textarea id="jtemplate" class="hide">
+{#if !$T.err_msg}
+<div class="pic fleft">
+    <img class="avatar" width="80" height="80" alt="{$T.email}" />
+    {#if $T.new_user}
+    <button id="add-as-contact">加为联系人</button>
+    {#/if}
+</div>
+
+<div class="txt fright">
+    {#if $T.user_nickname}
+    <p>{$T.user_nickname}</p>
+    {#/if}
+
+    <p>{$T.email}</p>
+
+    {#if $T.user_intro}
+    <p class="intro">{$T.user_intro}</p>
+    {#/if}
+</div>
+
+{#if $T.new_user}
+<form id="add-as-contact-form" class="hide" action="{{ SITE_ROOT }}contacts/add/" method="post">
+    <input type="hidden" name="user_email" value="{{ request.user.username }}" id="id_user_email" />
+    <label>邮箱：</label><br />
+    <input id="id_contact_email" type="text" name="contact_email" maxlength="255" value="{$T.email}" /><br />
+    <label>名字(可选)：</label><br />
+    <input id="id_contact_name" type="text" name="contact_name" maxlength="255" /><br />
+    <label>备注(可选)：</label><br />
+    <input id="id_note" type="text" name="note" maxlength="255" /><br />
+    <input type="submit" value="提交"  class="submit" />
+</form>
+{#/if}
+
+{#else}
+<p class="error">{$T.err_msg}</p>
+{#/if}
+
+</textarea>
diff --git a/templates/snippets/user_profile_js.html b/templates/snippets/user_profile_js.html
new file mode 100644
index 0000000000..07a6e93d08
--- /dev/null
+++ b/templates/snippets/user_profile_js.html
@@ -0,0 +1,50 @@
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-jtemplates.js"></script>
+<script type="text/javascript">
+//show profile when mouse over
+var Hide_profile = '';
+$('.member').hover(
+    function() {
+        var this_top = $(this).offset().top - $('#main').offset().top;
+        $(this).css('background', '#eee');
+        var avatar_url = $(this).children('.avatar').attr('src'),
+            avatar_url_array = avatar_url.split('/');
+        if (avatar_url_array[avatar_url_array.length-2] == 16) {//not default avatar
+            avatar_url_array[avatar_url_array.length-2] = 80;//choose avatar size 
+            avatar_url = avatar_url_array.join('/');
+        }
+        $.ajax({
+            url: $(this).children('.name').attr('href') + 'get/',
+            dataType: 'json',
+            success: function(data) {
+                $('#user-profile').setTemplateElement('jtemplate').processTemplate(data);
+                $('#user-profile .avatar').attr('src', avatar_url);
+                $('#user-profile').removeClass('hide');
+                $('#main').css('position', 'relative');
+                $('#add-as-contact').click(function() {
+                    //$('#add-as-contact-form').modal({appendTo: '#main'});
+                    $('#add-as-contact-form')[0].submit();
+                });
+                if (this_top + $('#user-profile').height() < $('#main').height()) {
+                    $('#user-profile').css('top', this_top - 10);
+                } else {
+                    $('#user-profile').css('top', $('#main').height() - $('#user-profile').height() - 5);
+                }
+            }
+        });
+        clearTimeout(Hide_profile);
+    },
+    function() {
+        $(this).css('background', '#fff');
+        Hide_profile = setTimeout(function() { $('#user-profile').addClass('hide'); }, 1000);
+    }
+);
+
+$('#user-profile').hover(
+    function() {
+        clearTimeout(Hide_profile);
+    },
+    function() {
+        $(this).addClass('hide');
+    }
+);
+</script>