haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity

Rewrite home and myhome page

Browse Source
This commit is contained in:
plt
2011-10-13 00:17:48 +08:00
parent 29b7e1d334
commit 3c9b48fea7
10 changed files with 113 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
base/templatetags/__init__.py Normal file
View File

9
base/templatetags/seahub_tags.py Normal file
View File

@@ -0,0 +1,9 @@
from datetime import datetime
from django import template
register = template.Library()
@register.filter(name='tsstr_sec')
def tsstr_sec(value):
"""Turn a timestamp to string"""
return datetime.utcfromtimestamp(value).strftime("%Y-%m-%d %H:%M:%S")

20
media/css/seahub.css
View File

@@ -21,13 +21,19 @@ table.default tr.even { background-color: #FAFAFA; }
table.default tr.odd { background-color: #E0E0E0; } table.default tr.odd { background-color: #E0E0E0; }
table.default tr.first { background-color: #00FF00; } table.default tr.first { background-color: #00FF00; }
/* container */ /* container */
#wrapper { margin:0 auto; width:950px; #wrapper { font: 13px/1.5 宋体, Arial, Helvetica, sans-serif; }
font-family: 宋体, Arial, Helvetica, sans-serif; font-size:13px; } #header, #main, #footer { width:950px; }
#header { font-size: 14px;font-weight: bold;min-height: 60px;} #header, #main { margin:0 auto; }
#main { padding-top:10px; } #header { font-size: 14px; font-weight: bold; }
#left-panel { float:left; width:120px; } #left-panel { float:left; width:120px; }
#right-panel { float:right; width:800px; } #right-panel { float:right; width:800px; }
#footer { color:#999; padding-top:2px; margin:25px 0; border-top:1px solid #DDD; } #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; }
.top-bar { height:20px; color:#fff; text-align:right; font-weight:bold; background:#606; }
.top-bar-in { width:950px; margin:0 auto; }
.top-bar a { color:#ddd; font-weight:normal; }
.top-bar a:hover { background:#A0A; }
/* #header */ /* #header */
#header .top_operation { float:right; margin:2px 10px 0 0; color:#ddd; font-size:13px; } #header .top_operation { float:right; margin:2px 10px 0 0; color:#ddd; font-size:13px; }
#header .top_operation a { font-weight:normal; font-size:13px; margin-left:2px; text-decoration: none; } #header .top_operation a { font-weight:normal; font-size:13px; margin-left:2px; text-decoration: none; }
@@ -45,8 +51,8 @@ div.nav-separator { clear: both; border-top: #FF8C00 1px solid; border-bottom: n
/* footer */ /* footer */
#footer a { color:#333; text-decoration:none; } #footer a { color:#333; text-decoration:none; }
/* main */ /* main */
h2 { font-size:16px; color:#292; padding:4px 0 2px 0px; margin:10px 0; } h2 { font-size:18px; color:#808; padding:4px 0 2px 0px; margin: 0; }
h3 { font-size: 14px; color: #808; margin: 10px 0px 4px 0; } h3 { font-size:14px; color:#808; margin-top:10px; font-weight:normal; }
p { line-height: 22px; } p { line-height: 22px; }
ol { margin:0; padding:0px 0 0 2em; list-style-position:inside; } ol { margin:0; padding:0px 0 0 2em; list-style-position:inside; }
ul { padding:4px 0 0 0; } ul { padding:4px 0 0 0; }

BIN
media/img/dropshadow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 B

44
templates/base.html
View File

@@ -14,35 +14,45 @@
<body> <body>
<div id="wrapper"> <div id="wrapper">
<div id="header"> <div id="top-bar">
<div class="top_operation"> <div class="top-bar">
{% if request.user.is_authenticated %} <div class="top-bar-in">
欢迎, {{ request.user }}. {% if request.user.is_authenticated %}
<a href="{{ SITE_ROOT }}home/my/">我的页面</a> 欢迎, {{ request.user }}.
<a href="{{ SITE_ROOT }}home/">社区</a> <a href="{{ SITE_ROOT }}home/my/">我的页面</a>
<a href="{{ SITE_ROOT }}profile/">设置</a> <a href="{{ SITE_ROOT }}home/">主页</a>
{% if request.user.is_staff %} <a href="{{ SITE_ROOT }}profile/">设置</a>
<a href="{{ SITE_ROOT }}admin/">管理</a> {% if request.user.is_staff %}
{% endif %} <a href="{{ SITE_ROOT }}admin/">管理</a>
<a href="{{ SITE_ROOT }}accounts/logout/">退出</a> {% endif %}
{% else %} <a href="{{ SITE_ROOT }}accounts/logout/">退出</a>
<a href="{{ SITE_ROOT }}accounts/login/">登录</a> {% else %}
<a href="{{ SITE_ROOT }}accounts/register/">注册</a> <a href="{{ SITE_ROOT }}accounts/login/">登录</a>
{% endif %} <a href="{{ SITE_ROOT }}accounts/register/">注册</a>
{% endif %}
</div>
</div>
</div>
<div id="header">
<div class="logo">
<a href="/home/" id="logo"><img src="{{ MEDIA_URL }}img/logo.png" title="Seafile" alt="Seafile logo" /></a>
</div> </div>
<img id="logo" src="{{ MEDIA_URL }}img/logo.png" title="Seafile" />
<div class="navs"> <div class="navs">
{% block nav %} {% block nav %}
<ul class="nav"> <ul class="nav">
<li> <li>
<a href="{{ SITE_ROOT }}home/">Home</a> <a href="{{ SITE_ROOT }}home/">主页</a>
</li> </li>
<!--
<li> <li>
<a href="{{ SITE_ROOT }}peers/">Peers</a> <a href="{{ SITE_ROOT }}peers/">Peers</a>
</li> </li>
-->
<!--
<li> <li>
<a href="{{ SITE_ROOT }}groups/">Groups</a> <a href="{{ SITE_ROOT }}groups/">Groups</a>
</li> </li>
-->
</ul> </ul>
{% endblock %} {% endblock %}
</div> </div>

23
templates/home.html
View File

@@ -6,18 +6,19 @@ Welcome.
{% block right_panel %} {% block right_panel %}
<h2>What's Ccnet</h2> <h2>什么是 Seafile</h2>
<p>Ccnet is a group oriented communication and file sharing tool. </p> <p>
Seafile 是一个海量文件同步和共享软件。 它非常适合于一个小组来同步和共享大量的文件，比如建立一个电子书的仓库。 它也适合于个人在多台电脑间同步数据。
</p>
<p>It provide two basic functions:<p> <p>
<ul> 使用上， seafile 允许用户创建多个文件盒， 每个文件盒可以单独的设置权限、加密、共享和同步。
<li>Versioned data sharing and synchronization.</li> </p>
<li>Group oriented message communication.</li>
</ul> <h2>用户控制数据</h2>
<p>
与其他的文件同步软件不同， seafile 强调用户对自身数据的控制。 用户的数据和数据的操作历史完整的保存在用户的电脑上， 服务器只是作为数据的中转站。 如果用户选择对数据加密， 加密的过程完全在用户的电脑上进行， 服务器上不知道文件是否加密。
</p>
<p>Features:</p>
<ul>
<li>data is at users' control</li>
</ul>
{% endblock %} {% endblock %}

29
templates/myhome.html
View File

@@ -1,5 +1,32 @@
{% extends "myhome_base.html" %} {% extends "myhome_base.html" %}
{% block right_panel %} {% block right_panel %}
Ccnet ID: {{ ccnet_user_id }} <h3>基本信息</h3>
<table class="default">
<tr>
<td>Seafile ID</td>
<td>{{ ccnet_user_id }}</td>
</tr>
<tr>
</tr>
</table>
<h3>我的文件盒</h3>
<table class="repo-list default">
<tr>
<th>名字</th>
<th>ID</th>
<th>描述</th>
</tr>
{% for repo in owned_repos %}
<tr>
<td><a href="/repo/{{ repo.props.id }}">{{ repo.props.name }}</a></td>
<td>{{ repo.props.id }}</td>
<td>{{ repo.props.desc }}</td>
</tr>
{% endfor %}
</table>
{% endblock %} {% endblock %}

4
templates/myhome_base.html
View File

@@ -2,8 +2,9 @@
{% block nav %} {% block nav %}
<ul class="nav"> <ul class="nav">
<li> <li>
<a href="{{ SITE_ROOT }}home/my/">Home</a> <a href="{{ SITE_ROOT }}home/my/">我的页面</a>
</li> </li>
<!--
<li> <li>
<a href="{{ SITE_ROOT }}repos/my/">Files</a> <a href="{{ SITE_ROOT }}repos/my/">Files</a>
</li> </li>
@@ -13,5 +14,6 @@
<li> <li>
<a href="{{ SITE_ROOT }}groups/">Groups</a> <a href="{{ SITE_ROOT }}groups/">Groups</a>
</li> </li>
-->
</ul> </ul>
{% endblock %} {% endblock %}

24
templates/repo.html
View File

@@ -1,19 +1,25 @@
{% extends "myhome_base.html" %} {% extends "myhome_base.html" %}
{% load seahub_tags %}
{% block right_panel %} {% block right_panel %}
<h3>Basic Info</h3> <h2>{{repo.props.name}}</h2>
<p><i>Name:</i> {{repo.props.name}}</p> <table class="default">
<p><i>ID:</i> {{repo.props.id}}</p> <tr>
<p><i>Description:</i> {{repo.props.desc}}</p> <td>ID</td>
<td>{{repo.props.id}}</td>
</tr>
<tr>
<td>描述</td>
<td>{{repo.props.desc}}</td>
</tr>
</table>
<h3>分支</h3>
<h3>Branches</h3>
Current branch: {{repo.props.head_branch}}
<table class="branch-list default"> <table class="branch-list default">
<tr> <tr>
<th>Name</th> <th>分支名</th>
<th>Head Commit</th> <th>Head Commit</th>
</tr> </tr>
{% for branch in branches %} {% for branch in branches %}
@@ -34,7 +40,7 @@ Current branch: {{repo.props.head_branch}}
{% for commit in commits %} {% for commit in commits %}
<tr> <tr>
<td>{{ commit.props.id }}</td> <td>{{ commit.props.id }}</td>
<td>{{ commit.props.ctime }}</td> <td>{{ commit.props.ctime|tsstr_sec }}</td>
<td>{{ commit.props.desc }}</td> <td>{{ commit.props.desc }}</td>
</tr> </tr>
{% endfor %} {% endfor %}

7
views.py
View File

@@ -131,9 +131,14 @@ def myhome(request):
ccnet_user_id = profile.ccnet_user_id ccnet_user_id = profile.ccnet_user_id
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
pass pass
owned_repos = []
if ccnet_user_id:
owned_repos = seafile_rpc.list_owned_repos(ccnet_user_id)
return render_to_response('myhome.html', { return render_to_response('myhome.html', {
"ccnet_user_id": ccnet_user_id, "ccnet_user_id": ccnet_user_id,
"owned_repos": owned_repos,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))