haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00
Code Issues Releases Wiki Activity

modified base ui, repo, group, contact

Browse Source
This commit is contained in:
llj
2012-05-17 14:11:22 +08:00
parent 3912e0d20c
commit a054f4a3f5
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contacts/templates/contacts/contact_add.html
View File

@@ -2,6 +2,7 @@
{% block nav_contacts_class %}class="cur"{% endblock %} {% block nav_contacts_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>操作</h3>
<ul class="with-bg"> <ul class="with-bg">
<li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li> <li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li>
</ul> </ul>
@@ -10,7 +11,7 @@
{% block right_panel %} {% block right_panel %}
<h2>添加联系人</h2> <h3>添加联系人</h3>
<form action="{{ SITE_ROOT }}contacts/add/" method="post" class="contact-op-form"> <form action="{{ SITE_ROOT }}contacts/add/" method="post" class="contact-op-form">
{% if error_msg %} {% if error_msg %}
<p class="error">{{ error_msg }}</p> <p class="error">{{ error_msg }}</p>

3
contacts/templates/contacts/contact_edit.html
View File

@@ -2,6 +2,7 @@
{% block nav_contacts_class %}class="cur"{% endblock %} {% block nav_contacts_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>操作</h3>
<ul class="with-bg"> <ul class="with-bg">
<li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li> <li><a href="{{ SITE_ROOT }}contacts/list/">联系人列表</a></li>
</ul> </ul>
@@ -10,7 +11,7 @@
{% block right_panel %} {% block right_panel %}
<h2>编辑联系人</h2> <h3>编辑联系人</h3>
<form action="" method="post" class="contact-op-form"> <form action="" method="post" class="contact-op-form">
{% if error_msg %} {% if error_msg %}
<p class="error">{{ error_msg }}</p> <p class="error">{{ error_msg }}</p>

3
contacts/templates/contacts/contact_list.html
View File

@@ -2,6 +2,7 @@
{% block nav_contacts_class %}class="cur"{% endblock %} {% block nav_contacts_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>操作</h3>
<ul class="with-bg"> <ul class="with-bg">
<li><a href="{{ SITE_ROOT }}contacts/add/">添加联系人</a></li> <li><a href="{{ SITE_ROOT }}contacts/add/">添加联系人</a></li>
</ul> </ul>
@@ -9,7 +10,7 @@
{% block right_panel %} {% block right_panel %}
<h2>联系人列表</h2> <h3>联系人列表</h3>
<table> <table>
<tr> <tr>
<th width="25%">邮箱</th> <th width="25%">邮箱</th>

1
group/templates/group/group_manage.html
View File

@@ -3,6 +3,7 @@
{% block nav_group_class %}class="cur"{% endblock %} {% block nav_group_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>操作</h3>
<ul class="with-bg"> <ul class="with-bg">
<li><a id="group-info" href="{{ SITE_ROOT }}group/{{ group_id }}/">返回小组</a></li> <li><a id="group-info" href="{{ SITE_ROOT }}group/{{ group_id }}/">返回小组</a></li>
<li><a id="group-remove" href="#">解散小组</a></li> <li><a id="group-remove" href="#">解散小组</a></li>

1
group/templates/group/groups.html
View File

@@ -3,6 +3,7 @@
{% block nav_group_class %}class="cur"{% endblock %} {% block nav_group_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>操作</h3>
<ul class="with-bg"> <ul class="with-bg">
<li><a id="group-add" href="#">添加小组</a></li> <li><a id="group-add" href="#">添加小组</a></li>
</ul> </ul>

4
group/views.py
View File

@@ -90,9 +90,9 @@ def group_info(request, group_id):
for member in members: for member in members:
member.short_username = member.user_name.split('@')[0] member.short_username = member.user_name.split('@')[0]
if member.is_staff == 1: if member.is_staff == 1:
managers.append(member) managers.append(member)
else: else:
common_members.append(member) common_members.append(member)
repos = [] repos = []
repo_ids = get_group_repoids(group_id=group_id_int) repo_ids = get_group_repoids(group_id=group_id_int)

8
media/css/seahub.css
View File

@@ -60,8 +60,8 @@ tr.first { background-color: #00FF00; }
min-height: 400px; min-height: 400px;
padding-top: 10px; padding-top: 10px;
} }
#left-panel { float:left; width:220px; } #left-panel { float:right; width:220px; }
#right-panel { float:right; width:700px; } #right-panel { float:left; width:680px; }
#footer { color:#999; padding-top:2px; margin:25px auto; border-top:1px solid #DDD; } #footer { color:#999; padding-top:2px; margin:25px auto; border-top:1px solid #DDD; }
/* top-bar */ /* top-bar */
#top-bar { height:20px; padding-bottom:21px; background:#fff url('../img/dropshadow.png') repeat-x center bottom; } #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 { #repo-page .side {
color:#333; color:#333;
width:260px; width:220px;
} }
#repo-page .main { #repo-page .main {
width:650px; width:680px;
} }
#repo-page a { #repo-page a {
font-weight:normal; font-weight:normal;

2
views.py
View File

@@ -246,10 +246,8 @@ def myhome(request):
groups_join = [] groups_join = []
for group in groups: for group in groups:
if group.props.creator_name == request.user.username: if group.props.creator_name == request.user.username:
group.my_create = True
groups_manage.append(group) groups_manage.append(group)
else: else:
group.my_create = False
groups_join.append(group) groups_join.append(group)
return render_to_response('myhome.html', { return render_to_response('myhome.html', {