diff --git a/templates/myhome_base.html b/templates/myhome_base.html index 07c0038b16..8168ce3a7f 100644 --- a/templates/myhome_base.html +++ b/templates/myhome_base.html @@ -8,7 +8,7 @@ {% if not request.cloud_mode %}
  • - 公共页面 + 公共资料
    • {% endif %} {% if business_mode %} @@ -20,7 +20,7 @@ {% else %}
  • - 小组 + 协作小组
    • {% endif %}
  • diff --git a/templates/public_home.html b/templates/public_home.html index 612af406f6..53eaee380a 100644 --- a/templates/public_home.html +++ b/templates/public_home.html @@ -56,52 +56,6 @@ {% endfor %} {% endif %} - - -
    -

    信息栏

    -
    -
    - {% for error in form.message.errors %} -

    {{ error|escape }}

    - {% endfor %} - -
    -
    -{% if innerpub_msgs %} - -{% endif %} -
    - {% if current_page != 1 %} - 上一页 - {% endif %} - {% if page_next %} - 下一页 - {% endif %} -
    - {% include "snippets/repo_share_form.html" %} @@ -118,7 +72,5 @@ {% with post_url=repo_create_url %} {% include "snippets/repo_create_js.html" %} {% endwith %} - -{% include 'group/msg_reply_js.html' %} {% endblock %} diff --git a/urls.py b/urls.py index c0bb7a479f..b44e4a467c 100644 --- a/urls.py +++ b/urls.py @@ -27,7 +27,6 @@ urlpatterns = patterns('', (r'^$', root), #url(r'^home/$', direct_to_template, { 'template': 'home.html' } ), url(r'^home/my/$', myhome, name='myhome'), - url(r'^home/public/$', public_home, name='public_home'), url(r'^home/public/reply/(?P[\d]+)/$', innerpub_msg_reply, name='innerpub_msg_reply'), url(r'^home/public/reply/new/$', innerpub_msg_reply_new, name='innerpub_msg_reply_new'), url(r'^home/owner/(?P[^/]+)/$', ownerhome, name='ownerhome'), @@ -92,7 +91,6 @@ urlpatterns = patterns('', url(r'^groups/', GroupListView.as_view(), name='group_list'), url(r'^deptgroups/', DeptGroupListView.as_view(), name='dept_group_list'), url(r'^projgroups/', ProjGroupListView.as_view(), name='proj_group_list'), - (r'^organizations/', include('seahub.organizations.urls')), (r'^profile/', include('seahub.profile.urls')), ### SeaHub admin ### @@ -109,3 +107,16 @@ if settings.DEBUG: (r'^%s/(?P.*)$' % (media_url), 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), ) +try: + from settings import CLOUD_MODE +except ImportError: + CLOUD_MODE = False +if CLOUD_MODE: + urlpatterns += patterns('', + (r'^organizations/', include('seahub.organizations.urls')), + ) +else: + urlpatterns += patterns('', + url(r'^home/public/$', public_home, name='public_home'), + ) + diff --git a/views.py b/views.py index 9733bfea4d..61d3c67529 100644 --- a/views.py +++ b/views.py @@ -763,58 +763,58 @@ def public_home(request): """ Show public home page when CLOUD_MODE is False. """ - if request.method == 'POST': - form = MessageForm(request.POST) + # if request.method == 'POST': + # form = MessageForm(request.POST) - if form.is_valid(): - msg = InnerPubMsg() - msg.from_email = request.user.username - msg.message = form.cleaned_data['message'] - msg.save() + # if form.is_valid(): + # msg = InnerPubMsg() + # msg.from_email = request.user.username + # msg.message = form.cleaned_data['message'] + # msg.save() - return HttpResponseRedirect(reverse('public_home')) - else: - form = MessageForm() + # return HttpResponseRedirect(reverse('public_home')) + # else: + # form = MessageForm() users = get_emailusers(-1, -1) public_repos = list_inner_pub_repos() - """inner pub messages""" - # Make sure page request is an int. If not, deliver first page. - try: - current_page = int(request.GET.get('page', '1')) - per_page= int(request.GET.get('per_page', '15')) - except ValueError: - current_page = 1 - per_page = 15 + # """inner pub messages""" + # # Make sure page request is an int. If not, deliver first page. + # try: + # current_page = int(request.GET.get('page', '1')) + # per_page= int(request.GET.get('per_page', '15')) + # except ValueError: + # current_page = 1 + # per_page = 15 - msgs_plus_one = InnerPubMsg.objects.all()[per_page*(current_page-1) : - per_page*current_page+1] - if len(msgs_plus_one) == per_page + 1: - page_next = True - else: - page_next = False - innerpub_msgs = msgs_plus_one[:per_page] + # msgs_plus_one = InnerPubMsg.objects.all()[per_page*(current_page-1) : + # per_page*current_page+1] + # if len(msgs_plus_one) == per_page + 1: + # page_next = True + # else: + # page_next = False + # innerpub_msgs = msgs_plus_one[:per_page] - msg_replies = InnerPubMsgReply.objects.filter(reply_to__in=innerpub_msgs) - reply_to_list = [ r.reply_to_id for r in msg_replies ] - for msg in innerpub_msgs: - msg.reply_cnt = reply_to_list.count(msg.id) + # msg_replies = InnerPubMsgReply.objects.filter(reply_to__in=innerpub_msgs) + # reply_to_list = [ r.reply_to_id for r in msg_replies ] + # for msg in innerpub_msgs: + # msg.reply_cnt = reply_to_list.count(msg.id) - # remove user notifications - UserNotification.objects.filter(to_user=request.user.username, - msg_type='innerpub_msg').delete() + # # remove user notifications + # UserNotification.objects.filter(to_user=request.user.username, + # msg_type='innerpub_msg').delete() return render_to_response('public_home.html', { 'users': users, 'public_repos': public_repos, - 'form': form, - 'innerpub_msgs': innerpub_msgs, - 'current_page': current_page, - 'prev_page': current_page-1, - 'next_page': current_page+1, - 'per_page': per_page, - 'page_next': page_next, + # 'form': form, + # 'innerpub_msgs': innerpub_msgs, + # 'current_page': current_page, + # 'prev_page': current_page-1, + # 'next_page': current_page+1, + # 'per_page': per_page, + # 'page_next': page_next, }, context_instance=RequestContext(request)) @login_required