From a054f4a3f5dcae079c877dd7f9905f09a38bf290 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 17 May 2012 14:11:22 +0800
Subject: [PATCH] modified base ui, repo, group, contact

---
 contacts/templates/contacts/contact_add.html  | 3 ++-
 contacts/templates/contacts/contact_edit.html | 3 ++-
 contacts/templates/contacts/contact_list.html | 3 ++-
 group/templates/group/group_manage.html       | 1 +
 group/templates/group/groups.html             | 1 +
 group/views.py                                | 4 ++--
 media/css/seahub.css                          | 8 ++++----
 views.py                                      | 2 --
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/contacts/templates/contacts/contact_add.html b/contacts/templates/contacts/contact_add.html
index d496a03b3b..17970d2510 100644
--- a/contacts/templates/contacts/contact_add.html
+++ b/contacts/templates/contacts/contact_add.html
@@ -2,6 +2,7 @@
 
 {% 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>
@@ -10,7 +11,7 @@
 
 {% block right_panel %}
 
-<h2>添加联系人</h2>
+<h3>添加联系人</h3>
 <form action="{{ SITE_ROOT }}contacts/add/" method="post" class="contact-op-form">
     {% if error_msg %}
     <p class="error">{{ error_msg }}</p>
diff --git a/contacts/templates/contacts/contact_edit.html b/contacts/templates/contacts/contact_edit.html
index 5e405c438f..25f195e52c 100644
--- a/contacts/templates/contacts/contact_edit.html
+++ b/contacts/templates/contacts/contact_edit.html
@@ -2,6 +2,7 @@
 
 {% 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>
@@ -10,7 +11,7 @@
 
 {% block right_panel %}
 
-<h2>编辑联系人</h2>
+<h3>编辑联系人</h3>
 <form action="" method="post" class="contact-op-form">
     {% if error_msg %}
     <p class="error">{{ error_msg }}</p>
diff --git a/contacts/templates/contacts/contact_list.html b/contacts/templates/contacts/contact_list.html
index dac2bbf296..516da2eb01 100644
--- a/contacts/templates/contacts/contact_list.html
+++ b/contacts/templates/contacts/contact_list.html
@@ -2,6 +2,7 @@
 
 {% block nav_contacts_class %}class="cur"{% endblock %}
 {% block left_panel %}
+<h3>操作</h3>
 <ul class="with-bg">
     <li><a href="{{ SITE_ROOT }}contacts/add/">添加联系人</a></li>
 </ul>
@@ -9,7 +10,7 @@
 
 {% block right_panel %}
 
-<h2>联系人列表</h2>
+<h3>联系人列表</h3>
 <table>
     <tr>
         <th width="25%">邮箱</th>
diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index 7293248c74..496ae2e5d5 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -3,6 +3,7 @@
 
 {% block nav_group_class %}class="cur"{% endblock %}
 {% block left_panel %}
+<h3>操作</h3>
 <ul class="with-bg">
     <li><a id="group-info" href="{{ SITE_ROOT }}group/{{ group_id }}/">返回小组</a></li>
     <li><a id="group-remove" href="#">解散小组</a></li>
diff --git a/group/templates/group/groups.html b/group/templates/group/groups.html
index 6766dde4a3..18ad574c0e 100644
--- a/group/templates/group/groups.html
+++ b/group/templates/group/groups.html
@@ -3,6 +3,7 @@
 
 {% block nav_group_class %}class="cur"{% endblock %}
 {% block left_panel %}
+<h3>操作</h3>
 <ul class="with-bg">
     <li><a id="group-add" href="#">添加小组</a></li>
 </ul>
diff --git a/group/views.py b/group/views.py
index f3b1b2c539..3e6f39268b 100644
--- a/group/views.py
+++ b/group/views.py
@@ -90,9 +90,9 @@ def group_info(request, group_id):
     for member in members:
         member.short_username = member.user_name.split('@')[0]
         if member.is_staff == 1:
-		    managers.append(member)
+            managers.append(member)
         else:
-		    common_members.append(member)
+            common_members.append(member)
     
     repos = []
     repo_ids = get_group_repoids(group_id=group_id_int)
diff --git a/media/css/seahub.css b/media/css/seahub.css
index b6c9b3c81d..2a917b814b 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -60,8 +60,8 @@ tr.first { background-color: #00FF00; }
     min-height: 400px;
     padding-top: 10px;
 }
-#left-panel { float:left; width:220px; }
-#right-panel { float:right; width:700px; }
+#left-panel { float:right; width:220px; }
+#right-panel { float:left; width:680px; }
 #footer { color:#999; padding-top:2px; margin:25px auto; border-top:1px solid #DDD; }
 /* top-bar */
 #top-bar { height:20px; padding-bottom:21px;  background:#fff url('../img/dropshadow.png') repeat-x center bottom; }
@@ -177,10 +177,10 @@ label { display: inline-block; margin:2px 0px; }
 }
 #repo-page .side {
     color:#333;
-    width:260px;
+    width:220px;
 }
 #repo-page .main {
-    width:650px;
+    width:680px;
 }
 #repo-page a {
     font-weight:normal;
diff --git a/views.py b/views.py
index d4d6d8131b..5c13cd0568 100644
--- a/views.py
+++ b/views.py
@@ -246,10 +246,8 @@ def myhome(request):
     groups_join = []
     for group in groups:
         if group.props.creator_name == request.user.username:
-            group.my_create = True
             groups_manage.append(group)
         else:
-            group.my_create = False
             groups_join.append(group)
     
     return render_to_response('myhome.html', {