diff --git a/media/css/seahub.css b/media/css/seahub.css index b92ad11b36..e5d6e33213 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -17,7 +17,7 @@ ul > li { list-style:none; } a { color:#ee8833; text-decoration:none; font-weight:bold; } a:hover { color: #ff9933; text-decoration: underline; } /* table */ -table { border-spacing: 0; border-collapse: collapse; width:770px; margin:3px 0 5px; } +table { border-spacing: 0; border-collapse: collapse; width:100%; margin:3px 0 5px; } td, th { padding: 3px; word-break:break-word; } th { /*color:#808;*/ color:#333; text-align:left; } tr.even { background-color: #FAFAFA; } @@ -205,13 +205,16 @@ input.ccnet_id { width: 400px; } margin-bottom: 12px; } /*repo page*/ -#token-show-switch { +.repo-desc { + margin:0; +} +#repo-access-switch { height:auto; } -.ui-tabs { - padding:1em; +.tip { + color:#808080; + font-size:12px; } -.ui-tabs .ui-tabs-nav, -.ui-tabs .ui-tabs-panel { - padding: 0; +.simplemodal-close { + margin-left:5px; } diff --git a/templates/repo.html b/templates/repo.html index fc865573d9..6e2ab507e3 100644 --- a/templates/repo.html +++ b/templates/repo.html @@ -1,22 +1,49 @@ {% extends "myhome_base.html" %} {% load seahub_tags %} -{% block nav_home_class %}class="cur"{% endblock %} {% block left_panel %} {% endblock %} {% block right_panel %} -

{{repo.props.name}}

+

{{repo.props.desc}}

+

+ WEB匿名访问: + {% if is_owner %} + {% if repo_ap == 'public' %} + + {% else %} + + {% endif %} + 开启后，任何人都能够访问该目录 + {% else %} + 只有同步目录拥有者可设置 + {% endif %} +

+ +

最近修改

+ + + + + + {% for commit in recent_commits %} + + + + + {% endfor %} +
修改时间描述
{{ commit.props.ctime|tsstr_sec }}{{ commit.props.desc }}
+查看全部修改

新口令:

@@ -24,119 +51,28 @@
-
- - -
-

基本信息

- - - - - - - - - - - - {% if is_owner %} - - {% else %} - - {% endif %} - - - - {% if is_owner %} - - {% else %} - - {% endif %} - -
ID{{repo.props.id}}
描述{{repo.props.desc}}
访问口令***** 只有同步目录拥有者可见
HTTP访问 - {% if repo_ap == 'public' %} - - {% else %} - - {% endif %} - - 开启后，任何人都能够访问该目录。 - 只有同步目录拥有者可选
-
- -
-

修改记录

- - - - - - - {% for commit in commits %} - - - - - - {% endfor %} -
修改时间描述
{{ commit.props.ctime|tsstr_sec }}{{ commit.props.desc }}
-
- {% if current_page != 1 %} - 上一页 - {% endif %} - {% if page_next %} - 下一页 - {% endif %} - 每页： - {% if per_page == 25 %} - 25 - {% else %} - 25 - {% endif %} - {% if per_page == 50 %} - 50 - {% else %} - 50 - {% endif %} - {% if per_page == 100 %} - 100 - {% else %} - 100 - {% endif %} -
-
+
+

确定要开启吗？

+ +
{% endblock %} {% block extra_script %} {% endblock %} diff --git a/templates/repo_history.html b/templates/repo_history.html new file mode 100644 index 0000000000..e2e07a777a --- /dev/null +++ b/templates/repo_history.html @@ -0,0 +1,48 @@ +{% extends "myhome_base.html" %} +{% load seahub_tags %} + +{% block left_panel %} + +{% endblock %} + +{% block right_panel %} +

{{repo.props.name}} 修改历史

+ + + + + + {% for commit in commits %} + + + + + {% endfor %} +
修改时间描述
{{ commit.props.ctime|tsstr_sec }}{{ commit.props.desc }}
+
+ {% if current_page != 1 %} + 上一页 + {% endif %} + {% if page_next %} + 下一页 + {% endif %} + 每页： + {% if per_page == 25 %} + 25 + {% else %} + 25 + {% endif %} + {% if per_page == 50 %} + 50 + {% else %} + 50 + {% endif %} + {% if per_page == 100 %} + 100 + {% else %} + 100 + {% endif %} +
+{% endblock %} diff --git a/urls.py b/urls.py index ea1928b0f5..5a3676bd04 100644 --- a/urls.py +++ b/urls.py @@ -3,7 +3,7 @@ from django.conf import settings from django.views.generic.simple import direct_to_template from seahub.views import root, peers, groups, myhome, \ - repo, group, modify_token, remove_repo, seafadmin, useradmin, \ + repo, repo_history, group, modify_token, remove_repo, seafadmin, useradmin, \ role_add, role_remove, activate_user, user_add, user_remove, \ ownerhome, remove_fetched_repo, repo_set_public, repo_unset_public, \ repo_list_dir, user_info, repo_set_access_property, repo_operation_file, \ @@ -35,6 +35,7 @@ urlpatterns = patterns('', (r'^download/$', direct_to_template, { 'template': 'download.html' } ), (r'^repo/(?P[^/]+)/$', repo), + (r'^repo/history/(?P[^/]+)/$', repo_history), (r'^repo/token/modify/(?P[^/]+)/$', modify_token), (r'^repo/remove/(?P[^/]+)/$', remove_repo), (r'^repo/removefetched/(?P[^/]+)/(?P[^/]+)/$', remove_fetched_repo), diff --git a/views.py b/views.py index a579564603..f7bd43ae31 100644 --- a/views.py +++ b/views.py @@ -137,6 +137,31 @@ def repo(request, repo_id): # raise Http404 repo = get_repo(repo_id) + + recent_commits = get_commits(repo_id, 0, 3) + + token = "" + is_owner = False + repo_ap = "" + + if request.user.is_authenticated(): + if validate_owner(request, repo_id): + is_owner = True + token = seafserv_threaded_rpc.get_repo_token(repo_id) + repo_ap = seafserv_threaded_rpc.repo_query_access_property(repo_id) + + return render_to_response('repo.html', { + "repo": repo, + "recent_commits": recent_commits, + "is_owner": is_owner, + "repo_ap": repo_ap, + "token": token, + }, context_instance=RequestContext(request)) + + +def repo_history(request, repo_id): + # TODO: check permission + repo = get_repo(repo_id) try: current_page = int(request.GET.get('page', '1')) per_page= int(request.GET.get('per_page', '25')) @@ -153,19 +178,7 @@ def repo(request, repo_id): page_next = False - branches = get_branches(repo_id) - - token = "" - is_owner = False - repo_ap = "" - - if request.user.is_authenticated(): - if validate_owner(request, repo_id): - is_owner = True - token = seafserv_threaded_rpc.get_repo_token(repo_id) - repo_ap = seafserv_threaded_rpc.repo_query_access_property(repo_id) - - return render_to_response('repo.html', { + return render_to_response('repo_history.html', { "repo": repo, "commits": commits, 'current_page': current_page, @@ -173,10 +186,6 @@ def repo(request, repo_id): 'next_page': current_page+1, 'per_page': per_page, 'page_next': page_next, - "branches": branches, - "is_owner": is_owner, - "repo_ap": repo_ap, - "token": token, }, context_instance=RequestContext(request))