1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00

Merge branch 'lj'

This commit is contained in:
xiez
2012-07-04 10:56:18 +08:00
2 changed files with 33 additions and 13 deletions

View File

@@ -13,21 +13,22 @@
<h3>我的小组</h3> <h3>我的小组</h3>
{% if groups %} {% if groups %}
<table> <ul class="group-list w100 ovhd">
<tr>
<th width="30%">名字</th>
<th width="40%">创建者</th>
<th width="30%">创建时间</th>
</tr>
{% for group in groups %} {% for group in groups %}
<tr> <li class="group fleft">
<td><a href="{{ SITE_ROOT }}group/{{ group.props.id }}/">{{ group.props.group_name }}</a></td> <div class="pic fleft">
<td>{{ group.props.creator_name }}</td> <a href="{{ SITE_ROOT }}group/{{ group.props.id }}/">
<td>{{ group.props.timestamp|tsstr_sec }}</td> <img src="{{ MEDIA_URL }}img/group.jpg" alt="小组图标" />
</tr> </a>
</div>
<div class="txt fright">
<h4><a href="{{ SITE_ROOT }}group/{{ group.props.id }}/">{{ group.props.group_name }}</a></h4>
<p><span class="item-name">创建者:</span>{{ group.props.creator_name }}</p>
<p><span class="item-name">创建时间:</span>{{ group.props.timestamp|tsstr_sec }}</p>
</div>
</li>
{% endfor %} {% endfor %}
</table> </ul>
{% else %} {% else %}
<p>暂无</p> <p>暂无</p>
{% endif %} {% endif %}

View File

@@ -444,6 +444,25 @@ table img {
text-decoration:none; text-decoration:none;
} }
/* group, org */ /* group, org */
.group-list {
margin-top:20px;
}
.group {
width:315px;
margin:0 25px 15px 0;
}
.group .txt {
color:#333;
width:250px;
}
.group h4 {
margin:0 0 4px;
}
.group .item-name {
display:inline-block;
width:5em;
color:#666;
}
.group-member .avatar, .group-member .avatar,
.org-member .avatar { .org-member .avatar {
border-radius: 2px; border-radius: 2px;