From 32f6a6cede143e8dc22cd774b81bca3efbd82ebe Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 18 May 2012 17:48:20 +0800
Subject: [PATCH 1/7] modifed group-member-icon;rewrite confirm dialog;add
 confirm to rm group

---
 group/templates/group/group_info.html   |   4 ++--
 group/templates/group/group_manage.html |  15 ++++++---------
 media/css/seahub.css                    |   5 ++++-
 media/img/default-person-16.png         | Bin 0 -> 836 bytes
 media/js/utils.js                       |  15 +++++++++------
 templates/base.html                     |   4 ++--
 6 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 media/img/default-person-16.png

diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 65b72132f7..5f5827b5cc 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -8,14 +8,14 @@
 <h3>管理员</h3>
 <ul>
 {% for member in managers %}
-<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
+<li><img src="{{MEDIA_URL}}img/default-person-16.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
 {% endfor %}
 
 <h3>成员</h3>
 {% if common_members %}
 <ul>
     {% for member in common_members %}
-	<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
+	<li><img src="{{MEDIA_URL}}img/default-person-16.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
     {% endfor %}
 </ul>
 {% else %}
diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index ef75761ad2..2083ad895e 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -5,17 +5,14 @@
 {% block left_panel %}
 <h3>操作</h3>
 <ul class="with-bg">
-    <li><a id="group-remove" href="#">解散小组</a></li>
+    <li><a id="group-remove" href="#" data="{{ SITE_ROOT }}group/rm?gid={{ group.id }}">解散小组</a></li>
     <li><a id="group-info" href="{{ SITE_ROOT }}group/{{ group.id }}/">返回小组</a></li>
 </ul>
 {% endblock %}
 
 {% block right_panel %}
-<h2>{{ group.group_name }}</h2>
-<h3>
-  小组成员列表
-  <button id="member-add">添加成员</button>
-</h3>
+<h2>{{ group.group_name }} 小组管理</h2>
+<h3> 小组成员列表<button id="member-add">添加成员</button></h3>
 {% if members %}
 <table class="member-list">
     <tr>
@@ -31,7 +28,6 @@
         {% else %}
         <td></td>
         {% endif %}
-        
     </tr>
     {% endfor %}
 </table>
@@ -58,7 +54,8 @@
 {% block extra_script %}
 <script type="text/javascript">
 $("#group-remove").click(function() {
-    location.href = "{{ SITE_ROOT }}group/rm?gid={{ group.id }}";
+	addConfirmTo($(this), '确定要解散该小组吗？');
+	return false;
 });
 
 $('.member-remove-btn').click(function() {
@@ -67,7 +64,7 @@ $('.member-remove-btn').click(function() {
 });
 
 $("#member-add").click(function() {
-    $("#member-add-form").modal({appendTo: "#main", containerCss:{padding:18}});
+    $("#member-add-form").modal({appendTo: "#main"});
     return false;
 });
                 
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 3a104e3cf4..181b77de4e 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -154,7 +154,7 @@ label { display: inline-block; margin:2px 0px; }
 /* popup dialog */
 #basic-modal-content {display:none;}
 #simplemodal-overlay { background-color:#000; }
-#simplemodal-container { background-color:#fff; border:3px solid #080; padding: 10px; }
+#simplemodal-container { background-color:#fff; border:3px solid #080; padding: 18px; }
 #simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
 #simplemodal-container a {color:#ddd;}
 #simplemodal-container a.modalCloseImg {background:url(../img/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
@@ -241,3 +241,6 @@ label { display: inline-block; margin:2px 0px; }
 .group-member-name {
 	vertical-align:middle;
 }
+#member-add {
+	margin-left:10px;
+}
diff --git a/media/img/default-person-16.png b/media/img/default-person-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..592f2b42e032684936aa22144814ddd98fed0366
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye`
z2p}m!{fp)R00P8GL_t(I%UzSdi(F+Gg`fAwcki9q%(^?X%CgBO%9@}_A>w}!u?iM;
z+68O`{{oBDR(2wYkj^rVjfIsUY9p8+ih?Uy*tjvXvpX}pbMM^y-TPULB;ctI2Tt=o
z?~#w+`!e5sb@X<B6mE*EnhNHIsv-tvirUJnDk1<Wbqo7$d^Er3&+lx0c=_tZPiEr<
z77Y`{B%rN8t++cOHylHff&kjF^~&IbBoD87Q?~Cu`r`x@OQuPJJ0>l|ivxCF-=wYJ
z(Ste5X~J_wMId=Pe6o;ck=^#k`%@Wi3~8Dqn4p=lHtccz%^lXa3sOqF@bZA)zM4>u
zTTn1DF?AmQT;a3vLc7xG%8u3z3&!ZR!P7E8vF`LY0+Zh(9-IhxP^O1<@_N=1XF{wL
zRMB9>neu;yJWwB(L<dpO2uDA(;%$YLCmqyIQbmGr{A)vb9O;c5fNI)u@NLC%EQlrq
znEcq{XFWVM%JQT`mWia$d172GIr}?Oj0{1T9Ymhouj!VCddK+##TS7=KcK00D<>`I
zlgRv}p`3J_?ni$5{DihjbTRSQ*Cl5Up+17sZwj)yAOxrAIWDzl<+P@&Bf8Akym5ie
z%LSur`HH!~){TsvH#*Mm2eg+cf+8yPI>TAIm-Cutp1A(jkas?PiS<hv=0YMt683KO
z*}K)FJWBleMZ^AQ5${759n}~@T}8?|a`Vm=Hebx2mIXm1v7#vy+rr-a0m~9*Lgpq)
zr(T~&Y8o~!Wu*VG3G&Rzv&?#s4Of`mgL|M?L>da5gYTzo?X|0SSH)COGc*aQTb-nt
zCi3SJb)Cpk=Dv2J7mv>>3PQSf`xjZ;SR;s&TTbD92KhQga9oYxvKrKq)U_gQKStlZ
zy8V&=)7?EiY-GM@IbT#{<OH0YmI-GRR?y3xe&5M+#Z6>*rC_nv-1!%EODIBP%@oK0
O0000<MNUMnLSTYx1&99t

literal 0
HcmV?d00001

diff --git a/media/js/utils.js b/media/js/utils.js
index 9a8a37677c..c1b9493d9c 100644
--- a/media/js/utils.js
+++ b/media/js/utils.js
@@ -1,15 +1,18 @@
-//add delete confirm dialog
-var Del_url = '';
-function addConfirmTo(ele) {
+//add op confirm dialog
+var Op_url = '';
+function addConfirmTo(ele, confirm_con) {
     ele.each(function() {
         $(this).click(function() {
-            $('#dialog-delete-confirm').modal({appendTo:'#main'});
-            Del_url = $(this).attr('data');
+			if (confirm_con) {
+				$('#confirm-con').html(confirm_con);
+			}
+            $('#dialog-confirm').modal({appendTo:'#main'});
+            Op_url = $(this).attr('data');
         });
     });
 }
 $('#yes-btn').click(function() {
-    location.href = Del_url;
+    location.href = Op_url;
 });
 
 //handle table
diff --git a/templates/base.html b/templates/base.html
index db8bc887fd..1405318e63 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -59,8 +59,8 @@
         <div id="main-panel" class="clear">
             {% block main_panel %}{% endblock %}
         </div>
-        <div id="dialog-delete-confirm" class="hide">
-            <p class="mgb5">确定要删除？</p>
+        <div id="dialog-confirm" class="hide">
+            <p class="mgb5" id="confirm-con">确定要删除？</p>
             <button id="yes-btn">确定</button>
             <button class="simplemodal-close">取消</button>
         </div>

From cd05efe89e3a6d1df66d7f163fb189c13c988e71 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 18 May 2012 21:32:16 +0800
Subject: [PATCH 2/7] add 'addAutocomplete' func; add autocomplete to
 add-group-member; modified repo-share

---
 group/templates/group/group_manage.html | 19 +++++++++--
 group/views.py                          |  7 +++-
 media/css/seahub.css                    | 21 ++++++------
 media/js/utils.js                       | 44 +++++++++++++++++++++++++
 templates/myhome.html                   | 35 +-------------------
 5 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index 2083ad895e..618ddde869 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -44,9 +44,10 @@
 
 <form id="member-add-form" action="{{ SITE_ROOT }}group/memberadd/" method="post" name="member-add-form" class="hide">
     <label>邮箱:</label><br />
-    <input id="user_name" name="user_name" value="" /><br />
+    <input id="added-member-name" name="user_name" value="" /><br />
     <input type="hidden" id="group_id" name="group_id" value="{{ group.id }}" />
-    <input type="submit" value="提交" />
+	<p class="error hide" id="member-add-error">输入不能为空。</p>
+    <input type="submit" value="提交" id="member-add-submit" />
 </form>
 
 {% endblock %}
@@ -63,10 +64,24 @@ $('.member-remove-btn').click(function() {
     $("#member-remove-form").submit();
 });
 
+var contact_list = [];
+{% for contact in contacts %}
+contact_list.push('{{ contact.contact_email }}');
+{% endfor %}
+addAutocomplete('#added-member-name', '#member-add-form', contact_list);
+
 $("#member-add").click(function() {
     $("#member-add-form").modal({appendTo: "#main"});
     return false;
 });
+
+$('#member-add-submit').click(function() {
+    if (!$.trim($('#added-member-name').attr('value'))) {
+        $('#member-add-error').removeClass('hide');
+        return false;
+    }
+    return true;
+});
                 
 </script>
 {% endblock %}
diff --git a/group/views.py b/group/views.py
index bef5da492f..f08ad18b48 100644
--- a/group/views.py
+++ b/group/views.py
@@ -14,6 +14,8 @@ from seahub.utils import go_error, go_permission_error, validate_group_name
 
 from pysearpc import SearpcError
 
+from seahub.contacts.models import Contact
+
 @login_required
 def group_list(request):
     groups = ccnet_rpc.get_groups(request.user.username);
@@ -122,7 +124,7 @@ def group_info(request, group_id):
 def group_add_member(request):
     if request.method == 'POST':
         group_id = request.POST.get('group_id')
-        member_name = request.POST.get('user_name')
+        member_name = request.POST.get('user_name').split(',')[0]
         if not validate_emailuser(member_name):
             err_msg = u'用户不存在'
             return go_error(request, err_msg)
@@ -193,10 +195,13 @@ def group_manage(request, group_id):
         return HttpResponseRedirect(reverse('group_list', args=[]))
     
     members = ccnet_rpc.get_group_members(group_id_int)
+
+    contacts = Contact.objects.filter(user_email=request.user.username)
     
     return render_to_response('group/group_manage.html', {
             'group' : group,
             'members': members,
+            'contacts': contacts,
             }, context_instance=RequestContext(request))
     
 def group_share_repo(request, repo_id, group_id, from_email):
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 181b77de4e..0d5d505780 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -158,6 +158,10 @@ label { display: inline-block; margin:2px 0px; }
 #simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
 #simplemodal-container a {color:#ddd;}
 #simplemodal-container a.modalCloseImg {background:url(../img/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
+#simplemodal-container .ui-menu-item a {/*for tip item of autocomplete*/
+    color:#e83;
+    font-weight:normal;
+}
 #simplemodal-container h3 {color:#84b8d9;}
 .simplemodal-close {
     margin-left:5px;
@@ -165,6 +169,13 @@ label { display: inline-block; margin:2px 0px; }
 #dialog-delete-confirm {
     text-align:center;
 }
+/*ui-autocomplete*/
+.ui-autocomplete {
+    background:#fff;
+}
+.ui-menu-item {
+    background-image:none;
+}
 /*myhome*/
 .mygroup {
 	float:left;
@@ -213,16 +224,6 @@ label { display: inline-block; margin:2px 0px; }
     width:260px;
     height:80px;
 }
-#repo-share-form .ui-autocomplete {
-    background:#fff;
-}
-#repo-share-form .ui-menu-item {
-    background-image:none;
-}
-#repo-share-form a {
-    color:#e83;
-    font-weight:normal;
-}
 /*contact*/
 .contact-op-form label {
     width:6em;
diff --git a/media/js/utils.js b/media/js/utils.js
index c1b9493d9c..13eb0cff1e 100644
--- a/media/js/utils.js
+++ b/media/js/utils.js
@@ -28,3 +28,47 @@ $("table tr:gt(0)").hover(
 		$(this).removeClass('hl');
 	}
 );
+
+/*
+ * func: add autocomplete to some input ele
+ * @param ele_id: autocomplete is added to this ele(ment), e.g-'#xxx'
+ * @param container_id: id of autocomplete's container, often container of element above
+ * @param data: tip data in array, e.g- ['xx', 'yy']
+ */
+function addAutocomplete(ele_id, container_id, data) {
+    function split(val) {
+        return val.split(/,\s*/);
+    }
+    function extractLast(term) {
+        return split(term).pop();
+    }
+
+    $(ele_id)
+        .bind("keydown", function(event) {
+            if (event.keyCode === $.ui.keyCode.TAB &&
+                $(this).data("autocomplete").menu.active) {
+                event.preventDefault();
+            }
+        })
+        .autocomplete({
+            appendTo: container_id,
+            autoFocus: true,
+            delay: 100,
+            minLength: 0,
+            source: function(request, response) {
+                        response($.ui.autocomplete.filter(data, extractLast(request.term)));
+                },
+            focus: function() {
+                        return false;
+                },
+            select: function(event, ui) {
+                var terms = split(this.value);
+                terms.pop();
+                terms.push(ui.item.value);
+                terms.push("");
+                this.value = terms.join(", ");
+                return false;
+            }
+        });
+}
+
diff --git a/templates/myhome.html b/templates/myhome.html
index 324c305f46..66b1cb95e9 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -121,40 +121,7 @@ $(function() {
     share_list.push('{{ group.props.group_name }} <{{ group.props.creator_name }}>');
     {% endfor %}
 
-    function split(val) {
-        return val.split(/,\s*/);
-    }
-    function extractLast(term) {
-        return split(term).pop();
-    }
-
-    $("#to_email")
-        .bind("keydown", function(event) {
-            if (event.keyCode === $.ui.keyCode.TAB &&
-                $(this).data("autocomplete").menu.active) {
-                event.preventDefault();
-            }
-        })
-        .autocomplete({
-            appendTo: '#repo-share-form',
-            autoFocus: true,
-            delay: 100,
-            minLength: 0,
-            source: function(request, response) {
-                        response($.ui.autocomplete.filter(share_list, extractLast(request.term)));
-                },
-            focus: function() {
-                        return false;
-                },
-            select: function(event, ui) {
-                var terms = split(this.value);
-                terms.pop();
-                terms.push(ui.item.value);
-                terms.push("");
-                this.value = terms.join(", ");
-                return false;
-            }
-        });
+	addAutocomplete('#to_email', '#repo-share-form', share_list);
 
     $(".repo-share-btn").click(function() {
         $("#share_repo_id").val($(this).attr("data"));

From cff0b604bed9863a33840844825266444d402461 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 18 May 2012 21:50:48 +0800
Subject: [PATCH 3/7] Center contact_add/edit & 'registration' pages

---
 contacts/templates/contacts/contact_add.html  | 15 +++--------
 contacts/templates/contacts/contact_edit.html | 15 +++--------
 media/css/seahub.css                          |  7 +++++
 templates/registration/activate.html          |  2 +-
 .../registration/activation_complete.html     |  4 +--
 templates/registration/login.html             | 24 +++++++++--------
 templates/registration/logout.html            |  9 +++----
 .../registration/password_change_done.html    |  7 +----
 .../registration/password_change_form.html    | 26 ++++++++++---------
 .../registration/password_reset_complete.html | 13 ++--------
 .../registration/password_reset_confirm.html  | 24 +++++++----------
 .../registration/password_reset_done.html     |  9 ++-----
 .../registration/password_reset_form.html     | 13 +++++-----
 .../registration/registration_closed.html     |  2 +-
 .../registration/registration_complete.html   |  5 +++-
 templates/registration/registration_form.html | 16 +++++++-----
 16 files changed, 83 insertions(+), 108 deletions(-)

diff --git a/contacts/templates/contacts/contact_add.html b/contacts/templates/contacts/contact_add.html
index 17970d2510..c944990622 100644
--- a/contacts/templates/contacts/contact_add.html
+++ b/contacts/templates/contacts/contact_add.html
@@ -1,16 +1,9 @@
 {% extends "myhome_base.html" %}
 
 {% block nav_contacts_class %}class="cur"{% endblock %}
-{% block left_panel %}
-<h3>操作</h3>
-<ul class="with-bg">
-    <li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li>
-</ul>
-{% endblock %}
-
-
-{% block right_panel %}
 
+{% block main_panel %}
+<div class="w350 center">
 <h3>添加联系人</h3>
 <form action="{{ SITE_ROOT }}contacts/add/" method="post" class="contact-op-form">
     {% if error_msg %}
@@ -23,7 +16,7 @@
     {{ form.contact_name }}<br />
     <label>备注(可选)：</label>
     {{ form.note }}<br />
-    <input type="submit" value="提交" class="submit" />
+    <input type="submit" value="提交" class="submit" /> <a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a>
 </form>
-
+</div>
 {% endblock %}
diff --git a/contacts/templates/contacts/contact_edit.html b/contacts/templates/contacts/contact_edit.html
index 25f195e52c..c1a67bcc1e 100644
--- a/contacts/templates/contacts/contact_edit.html
+++ b/contacts/templates/contacts/contact_edit.html
@@ -1,16 +1,9 @@
 {% extends "myhome_base.html" %}
 
 {% block nav_contacts_class %}class="cur"{% endblock %}
-{% block left_panel %}
-<h3>操作</h3>
-<ul class="with-bg">
-    <li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li>
-</ul>
-{% endblock %}
-
-
-{% block right_panel %}
 
+{% block main_panel %}
+<div class="w350 center">
 <h3>编辑联系人</h3>
 <form action="" method="post" class="contact-op-form">
     {% if error_msg %}
@@ -25,7 +18,7 @@
     {{ form.note }}<br />
     <input type="hidden" name="contact_id" value="{{ contact_id }}" />
     <input type="hidden" name="old_contact_email" value="{{ old_contact_email }}" />
-    <input type="submit" value="提交" class="submit" />
+    <input type="submit" value="提交" class="submit" /> <a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a>
 </form>
-
+</div>
 {% endblock %}
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 0d5d505780..7b4402b23b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -48,6 +48,13 @@ tr.hl { background-color: #ddddff; }/*highlight*/
 .even th { background:#eee; }
 .odd th { background:#ddd; }
 tr.first { background-color: #00FF00; }
+
+.w350 {
+    width:350px;
+}
+.center {
+    margin:0 auto;
+}
 /* container */
 #wrapper { font: 13px/1.5 Arial, Helvetica, sans-serif; }
 #header, #main, #footer { width:950px; }
diff --git a/templates/registration/activate.html b/templates/registration/activate.html
index 86d2faf655..9b59dcfb74 100644
--- a/templates/registration/activate.html
+++ b/templates/registration/activate.html
@@ -3,5 +3,5 @@
 {% block title %}Create an account{% endblock %}
 
 {% block main_panel %}
-激活码错误。 
+<p class="error w350 center">激活码错误。</p>
 {% endblock %}
diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html
index a84599f880..ef448b5a40 100644
--- a/templates/registration/activation_complete.html
+++ b/templates/registration/activation_complete.html
@@ -1,8 +1,8 @@
 {% extends "myhome_base.html" %}
 
-{% block title %}Create an account{% endblock %}
+{% block title %}帐号已激活{% endblock %}
 
 {% block main_panel %}
-你的帐号已经激活。 <a href="{{ SITE_ROOT }}accounts/login/">登录</a>
+<p class="w350 center">你的帐号已经激活。 <a href="{{ SITE_ROOT }}accounts/login/">登录</a></p>
 {% endblock %}
  
diff --git a/templates/registration/login.html b/templates/registration/login.html
index b77b8c4214..4421dd1f99 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,21 +1,23 @@
 {% extends "myhome_base.html" %}
 {% block title %}用户登录{% endblock %}
 {% block main_panel %}
+<div class="w350 center">
 <h2>用户登录</h2>
 <form action="" method="post" class="login">
-  <label for="username">邮箱：</label>
-  <input type="text" name="username" value="" style="color:#666;" autocomplete="off" /><br />
-  <label for="password">密码：</label>
-   <input type="password" name="password" value="" autocomplete="off" /><br />
-    <p class="error hide"></p>
-    <input type="submit" value="提交" class="submit" />
-    <a href="{{ SITE_ROOT }}accounts/password/reset/">忘记密码？</a>
-    {% if next %}
+    <label for="username">邮箱：</label>
+	<input type="text" name="username" value="" style="color:#666;" autocomplete="off" /><br />
+	<label for="password">密码：</label>
+	<input type="password" name="password" value="" autocomplete="off" /><br />
+	<p class="error hide"></p>
+	<input type="submit" value="提交" class="submit" />
+	<a href="{{ SITE_ROOT }}accounts/password/reset/">忘记密码？</a>
+{% if next %}
     <input type="hidden" name="next" value="{{ next|escape }}" />
-    {% else %}
+{% else %}
     <input type="hidden" name="next" value="{{ SITE_ROOT }}" />
-    {% endif %}
-  </form>
+{% endif %}
+</form>
+</div>
 {% endblock %}
 {% block extra_script %}
 <script type="text/javascript">
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index a6948a46da..7af7361f7c 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -3,9 +3,8 @@
 {% block title %}退出{% endblock %}
 
 {% block main_panel %}
-
-<p>感谢参与。</p>
-
-<a href="{{ SITE_ROOT }}accounts/login/">重新登录</a>
-
+<div class="w350 center">
+	<p>感谢参与。</p>
+	<a href="{{ SITE_ROOT }}accounts/login/">重新登录</a>
+</div>
 {% endblock %}
diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
index 62d4758467..5a53c0cde2 100644
--- a/templates/registration/password_change_done.html
+++ b/templates/registration/password_change_done.html
@@ -1,14 +1,9 @@
 {% extends "accounts.html" %}
-{% load i18n %}<!--
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}-->
 
 {% block title %}{% trans 'Password change successful' %}{% endblock %}
 
 {% block main_panel %}
 
-<h2>{% trans 'Password change successful' %}</h2>
-
-<p>{% trans 'Your password was changed.' %}</p>
+<p class="w350 center">您的密码已成功修改。</p>
 
 {% endblock %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index b7d578da52..a35081ec0a 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -1,15 +1,17 @@
 {% extends "accounts.html" %}
-{% load i18n %}
-{% block title %}{% trans 'Password change' %}{% endblock %}
+{% block title %}密码修改{% endblock %}
+
 {% block main_panel %}
-<h2>{% trans 'Password change' %}</h2>
-<form action="" method="post" class="pwd_change">
-<label for="id_old_password">当前密码：</label>{{ form.old_password }}<br />
-{{ form.old_password.errors }}
-<label for="id_new_password1">新密码：</label>{{ form.new_password1 }}<br />
-{{ form.new_password1.errors }}
-<label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}<br />
-{{ form.new_password2.errors }}
-<input type="submit" value="提交" class="submit" />
-</form>
+<div class="w350 center">
+	<h2>密码修改</h2>
+	<form action="" method="post" class="pwd_change">
+		<label for="id_old_password">当前密码：</label>{{ form.old_password }}<br />
+		{{ form.old_password.errors }}
+		<label for="id_new_password1">新密码：</label>{{ form.new_password1 }}<br />
+		{{ form.new_password1.errors }}
+		<label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}<br />
+		{{ form.new_password2.errors }}
+		<input type="submit" value="提交" class="submit" />
+	</form>
+</div>
 {% endblock %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index f7c4476fca..228dd12f6f 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -1,16 +1,7 @@
 {% extends "myhome_base.html" %}
-{% load i18n %}
 
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
-
-{% block title %}{% trans 'Password reset complete' %}{% endblock %}
+{% block title %}密码重置成功{% endblock %}
 
 {% block main_panel %}
-
-<h2>{% trans 'Password reset complete' %}</h2>
-
-<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
-
-<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
-
+<p class="w350 center">密码重置成功。 <a href="{{ login_url }}">登录</a></p>
 {% endblock %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 6d814e260a..1e5ddfcd21 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -1,32 +1,26 @@
 {% extends "myhome_base.html" %}
-{% load i18n %}
 
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset confirmation' %}</div>{% endblock %}
-
-{% block title %}{% trans 'Password reset' %}{% endblock %}
+{% block title %}密码重置{% endblock %}
 
 {% block main_panel %}
-
+<div class="w350 center">
 {% if validlink %}
 
-<h2>{% trans 'Enter new password' %}</h2>
-
-<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+<h2>请输入新密码</h2>
 
 <form action="" method="post">
 {{ form.new_password1.errors }}
-<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
+<p class="aligned wide"><label for="id_new_password1">新密码：</label>{{ form.new_password1 }}</p>
 {{ form.new_password2.errors }}
-<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
-<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+<p class="aligned wide"><label for="id_new_password2">密码确认：</label>{{ form.new_password2 }}</p>
+<p><input type="submit" value="提交" /></p>
 </form>
 
 {% else %}
 
-<h1>{% trans 'Password reset unsuccessful' %}</h1>
-
-<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}
+<h2>密码重置失败</h2>
+<p>重置链接失效。请重新重置。</p>
 
 {% endif %}
-
+</div>
 {% endblock %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
index 10169f6128..cade32cfe6 100644
--- a/templates/registration/password_reset_done.html
+++ b/templates/registration/password_reset_done.html
@@ -1,14 +1,9 @@
 {% extends "myhome_base.html" %}
-{% load i18n %}
 
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
-
-{% block title %}{% trans 'Password reset successful' %}{% endblock %}
+{% block title %}密码重置成功{% endblock %}
 
 {% block main_panel %}
 
-<h2>{% trans 'Password reset successful' %}</h2>
-
-<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
+<p class="w350 center">我们已经把密码重置说明发往您提交的邮箱里，请查收。</p>
 
 {% endblock %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index f6c1de7c03..c1fc0c7e9b 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -1,14 +1,13 @@
 {% extends "myhome_base.html" %}
-{% load i18n %}
 
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
-{% block title %}{% trans "Password reset" %}{% endblock %}
+{% block title %}密码重置{% endblock %}
 {% block main_panel %}
-<h2>{% trans "Password reset" %}</h2>
-<p>请在下面输入您的 e-mail 地址，我们会把新密码设置说明通过邮件发送给您。</p>
+<div class="w350 center">
+<h2>密码重置</h2>
 <form action="" method="post">
-<label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }}
- <input type="submit" value="提交" />
+<label for="id_email">邮箱：</label> {{ form.email }} <input type="submit" value="提交" />
+<p>[我们会把新密码设置说明通过邮件发送给您]</p>
 {{ form.email.errors }}
 </form>
+</div>
 {% endblock %}
diff --git a/templates/registration/registration_closed.html b/templates/registration/registration_closed.html
index 37152dc408..dd1b1839ea 100644
--- a/templates/registration/registration_closed.html
+++ b/templates/registration/registration_closed.html
@@ -3,6 +3,6 @@
 {% block title %}Create an account{% endblock %}
 
 {% block main_panel %}
-Closed.
+<p class="w350 center">注册关闭。</p>
 {% endblock %}
  
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
index bb24862d4f..0fa3938076 100644
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@@ -1,10 +1,13 @@
 {% extends "myhome_base.html" %}
 {% block title %}感谢注册{% endblock %}
 {% block main_panel %}
+<div class="w350 center">
 {% if send_mail %}
-<p>感谢注册，激活邮件已发往您的邮箱,请查收。如果您在收件箱里没找到，请检查下是否被当成垃圾邮件了。</p>
+<p>感谢注册，激活邮件已发往您的邮箱,请查收。</P>
+<p>如果您在收件箱里没找到，请检查下是否被当成垃圾邮件了。</p>
 {% else %}
 <p>感谢注册，请等待管理员激活你的帐号。</p>
 {% endif %}
+</div>
 {% endblock %}
  
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 1d37ee1353..cc53fa5da7 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -1,21 +1,23 @@
 {% extends "myhome_base.html" %}
 {% block title %}用户注册{% endblock %}
 {% block main_panel %}
-<h2>用户注册</h2>
-  <form action="" method="post" class="reg">
-     <label for="id_email">邮箱：</label>
+<div class="w350 center">
+    <h2>用户注册</h2>
+    <form action="" method="post" class="reg">
+        <label for="id_email">邮箱：</label>
         {{ form.email }}
         {% if form.email.errors %}
         {{ form.email.errors }}
         {% endif %}<br />
-     <label for="id_password1">密码：</label>
+        <label for="id_password1">密码：</label>
         {{ form.password1 }}
         {% if form.password1.errors %}
         {{ form.password1.errors }}
         {% endif %}<br />
-     <label for="id_password2">确认密码：</label>
+        <label for="id_password2">确认密码：</label>
         {{ form.password2 }}<br />
-      <input type="submit" value="提交" class="submit" />
-  </form>
+        <input type="submit" value="提交" class="submit" />
+    </form>
+</div>
 {% endblock %}
  

From faacf811da0c443ac6a30dbdbe80ecce306494e5 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 19 May 2012 15:30:58 +0800
Subject: [PATCH 4/7] modified style of h2, group-member-add

---
 group/templates/group/group_manage.html |   2 +-
 media/css/seahub.css                    |   8 ++++++--
 media/img/add.png                       | Bin 0 -> 680 bytes
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 media/img/add.png

diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index 618ddde869..f24d26836a 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -12,7 +12,7 @@
 
 {% block right_panel %}
 <h2>{{ group.group_name }} 小组管理</h2>
-<h3> 小组成员列表<button id="member-add">添加成员</button></h3>
+<h3>小组成员列表<a id="member-add" href="#" class="fright">添加成员</a></h3>
 {% if members %}
 <table class="member-list">
     <tr>
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 7b4402b23b..7d544ee682 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -29,7 +29,7 @@ ul > li { list-style:none; }
 a { color:#ee8833; text-decoration:none; font-weight:bold; }
 a:hover { color: #ff9933; text-decoration: underline; }
 img { border:none; }
-h2 { font-size:18px; color:#808; margin-bottom:8px; }
+h2 { font-size:18px; color:#808; margin:10px 0 8px; }
 h3 { font-size:15px; color:#808; font-weight:normal; margin:10px 0 6px; }
 ol { padding-left:2em; }
 /* table */
@@ -250,5 +250,9 @@ label { display: inline-block; margin:2px 0px; }
 	vertical-align:middle;
 }
 #member-add {
-	margin-left:10px;
+    font-size:13px;
+    padding-left:18px;
+    text-decoration:underline;
+    background:transparent url('../img/add.png') scroll no-repeat left 50%;
+    margin-top:2px;
 }
diff --git a/media/img/add.png b/media/img/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6d26db7c071da62daed91569d69ed280969707b
GIT binary patch
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007SNkl<ZILoDz
z>r0bi7>E5^wl4*Pq=s22s3|2_C~w(pii%F#mUC;0&h~CDox05fEu9k&6}6$;Xrwzh
z55ogy;?&Yb>g!OVjUotY!>_;I6-`IWh#vTTdEmO9=f1h`BmhbOlix0M({;=akA!S>
ziKylYL0JBxI^6KQf|6RxNYQ99^F)DeT1vD}N<z=pd$Af?g#Ysf)<3OaGGK?&Qv<$<
z6XHF&P9zlkgvF8RJv$D*?P2zV3npq1k9Q2P@0+mnaSqxA8A?a;Biz9}B2J*4k}_yG
z=-#zp@9Q>(xAl0q)`4zcD-3=e`utjSZ??dFU<c_DqR@CHSkRlzhzV#|(Z8(5yDyvc
zi+$+b(n9k}iC;&(CWCxY2*q+OoclK19LYi6gA7GX(BiD2Tmc*XRWmwQRcKq0LpCdl
z2?RDS8fMBMohrt_8y)mZ&A8m1M#Th*asHwAy$k(sbu`?BKOOO85ft-$Sp37t(xo28
z1Wk6{;Y45z+6@vaU;T*!(pwFye+cOv>?1+Ft(-FYv@mRG(DYIW@q7h%)*EqPG<Q8*
z^!wE4^4`M*b@EXO;;|CNZ7TsszyjHPB_!U`A2lBrh@2eMxr^c0HRDoGD%kf~M@<x(
zix^c;3xlLbfN^Rx*03m8>x?D}b1|`F!X3-4C>%^yo@T@iQu(6-qGaf5q|s3cCoM7h
z+Ck1#K|WOp<7yimG%U1mz*ey$G)yEMWzIk@K^SsE`2(5gSs-D4ZGd^h0FAd1SzRen
zICLCNxJ=jdnatdtbTYg1B9);@38%H64WDm4L!DEx$YkXy=3lq*U-KP7M#~=nDAU0J
O0000<MNUMnLSTYmpEryE

literal 0
HcmV?d00001


From 5792594c1516025a420ca3bd006b7e75078ea495 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 19 May 2012 18:29:52 +0800
Subject: [PATCH 5/7] fix bug in autocomplete

---
 group/templates/group/group_manage.html | 2 +-
 media/js/utils.js                       | 8 ++++----
 templates/myhome.html                   | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index f24d26836a..a3099ab670 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -68,10 +68,10 @@ var contact_list = [];
 {% for contact in contacts %}
 contact_list.push('{{ contact.contact_email }}');
 {% endfor %}
-addAutocomplete('#added-member-name', '#member-add-form', contact_list);
 
 $("#member-add").click(function() {
     $("#member-add-form").modal({appendTo: "#main"});
+    addAutocomplete('#added-member-name', '#member-add-form', contact_list);
     return false;
 });
 
diff --git a/media/js/utils.js b/media/js/utils.js
index 13eb0cff1e..06906178bf 100644
--- a/media/js/utils.js
+++ b/media/js/utils.js
@@ -56,11 +56,11 @@ function addAutocomplete(ele_id, container_id, data) {
             delay: 100,
             minLength: 0,
             source: function(request, response) {
-                        response($.ui.autocomplete.filter(data, extractLast(request.term)));
-                },
+                response($.ui.autocomplete.filter(data, extractLast(request.term)));
+            },
             focus: function() {
-                        return false;
-                },
+                return false;
+            },
             select: function(event, ui) {
                 var terms = split(this.value);
                 terms.pop();
diff --git a/templates/myhome.html b/templates/myhome.html
index 66b1cb95e9..26aa7d035c 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -121,11 +121,10 @@ $(function() {
     share_list.push('{{ group.props.group_name }} <{{ group.props.creator_name }}>');
     {% endfor %}
 
-	addAutocomplete('#to_email', '#repo-share-form', share_list);
-
     $(".repo-share-btn").click(function() {
         $("#share_repo_id").val($(this).attr("data"));
-        $("#repo-share-form").modal({appendTo: "#main", containerCss:{padding:18}});
+        $("#repo-share-form").modal({appendTo: "#main"});
+        addAutocomplete('#to_email', '#repo-share-form', share_list);
     });
 
     //check before post

From c0df5bc283934d3f37d7342c5c50bf56ecaab03d Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 19 May 2012 20:28:04 +0800
Subject: [PATCH 6/7] modified ui of seafadmin

---
 templates/repos.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/repos.html b/templates/repos.html
index a16351f98f..52f668b15a 100644
--- a/templates/repos.html
+++ b/templates/repos.html
@@ -6,10 +6,10 @@
 {% if repos %}
 <table>
     <tr>
-        <th width="20%">名字</th>
-        <th width="20%">拥有者</th>
-        <th width="52%">描述</th>
-        <th width="8%">操作</th>
+        <th width="25%">名字</th>
+        <th width="28%">拥有者</th>
+        <th width="40%">描述</th>
+        <th width="7%">操作</th>
     </tr>
     {% for repo in repos %}
     <tr>

From 93a5b54c18ac54256c5336e98e6f9cfb148ed9c5 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 19 May 2012 21:27:46 +0800
Subject: [PATCH 7/7] modified repo-history page

---
 templates/repo_history.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo_history.html b/templates/repo_history.html
index c46553c091..a47acb0e04 100644
--- a/templates/repo_history.html
+++ b/templates/repo_history.html
@@ -2,7 +2,8 @@
 {% load seahub_tags %}
 
 {% block left_panel %}
-<ul>
+<h3>操作</h3>
+<ul class="with-bg">
     <li><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">返回同步目录</a></li>
 </ul>
 {% endblock %}