Skip to content

Commit

Permalink
rename to Review Stages
Browse files Browse the repository at this point in the history
  • Loading branch information
alice6373 committed Oct 4, 2020
1 parent 2881ea9 commit db4fea7
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 28 deletions.
8 changes: 4 additions & 4 deletions src/locale/zh_Hant/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -1444,10 +1444,10 @@ msgid "Reviews"
msgstr "審查"

#: templates/default/_includes/dashboard_tablist.html:28
#: templates/default/reviews/review_change.html:12
#: templates/default/reviews/review_change.html:18
msgid "Change Review"
msgstr "更改審查設定"
#: templates/default/reviews/review_stages.html:12
#: templates/default/reviews/review_stages.html:18
msgid "Review Stages"
msgstr "審查階段"

#: templates/default/_includes/nav/dashboard_nav.html:10
msgid "Log out"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/templates/default/_includes/dashboard_tablist.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{% if user.is_superuser %}
<li class="{% if active == 'admin' %}active{% endif %}">
<a href="{% url 'review_change' %}">{% trans 'Change Review' %}</a>
<a href="{% url 'review_stages' %}">{% trans 'Review Stages' %}</a>
</li>
{% endif %}
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% block main-content %}

<h3 class="dashboard-header">
<span class="header-title">{% trans 'Change Review' %}</span>
<span class="header-title">{% trans 'Review Stages' %}</span>
</h3>

<div class="dashboard-body">
Expand All @@ -38,7 +38,7 @@ <h3 class="dashboard-header">
</div>
<!--Review Change Setting-->
<div class="col-md-9">
<form action="{% url 'review_change' %}" method="post">
<form action="{% url 'review_stages' %}" method="post">
{% csrf_token %}
<div class="panel panel-default">
<div class="panel-heading">{% trans 'Change Review' %}</div>
Expand Down Expand Up @@ -156,6 +156,6 @@ <h3 class="dashboard-header">
<!--{{ block.super }}
<script src="{% static 'js/vendors/simplemde.min.js' %}"></script>-->
{% compress js %}
<script src="{% static 'js/reviews/review_change.js' %}"></script>
<script src="{% static 'js/reviews/review_stages.js' %}"></script>
{% endcompress %}
{% endblock extra_js %}
35 changes: 17 additions & 18 deletions src/users/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,32 @@


urlpatterns = [

url(r'^login/$', views.login, name='login'),
url(r'^logout/$', views.logout, name='logout'),
url(r'^profile/$', views.user_profile_update, name='user_profile_update'),

url(r'^password-change/$', views.password_change, name='password_change'),
url(r'^password-change/done/$',
views.password_change_done, name='password_change_done'),

url(r'^signup/$',
views.user_signup, name='signup'),
views.password_change_done,
name='password_change_done'),
url(r'^signup/$', views.user_signup, name='signup'),
url(r'^verify/(?P<verification_key>[-:\w]+)/$',
views.user_verify, name='user_verify'),
views.user_verify,
name='user_verify'),
url(r'^verification-request/$',
views.request_verification, name='request_verification'),

views.request_verification,
name='request_verification'),
url(r'^password-reset/$', views.password_reset, name='password_reset'),
url(r'^password-reset/done/$',
views.password_reset_done, name='password_reset_done'),
url(r'^password-reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
views.password_reset_done,
name='password_reset_done'),
url(
r'^password-reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
r'(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
views.password_reset_confirm, name='password_reset_confirm'),
views.password_reset_confirm,
name='password_reset_confirm'),
url(r'^password-reset/complete/$',
views.password_reset_complete, name='password_reset_complete'),

url(r'^agreement/$',
views.coc_agree, name='coc_agreement'),
url(r'^review-change/$', views.review_change, name='review_change'),

views.password_reset_complete,
name='password_reset_complete'),
url(r'^agreement/$', views.coc_agree, name='coc_agreement'),
url(r'^review-stages/$', views.review_stages, name='review_stages'),
]
4 changes: 2 additions & 2 deletions src/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def get_context_data(self, **kwargs):
context.update(**reviews_state()._asdict())
return context

def review_change(request):
def review_stages(request):

# Get default TimeZone
tz = pytz.timezone(settings.TIME_ZONE)
Expand Down Expand Up @@ -227,7 +227,7 @@ def review_change(request):
reg[CONFERENCE_DEFAULT_SLUG + '.reviews.stage'] = int(request.POST['reviews.stage'])
reg[CONFERENCE_DEFAULT_SLUG + '.proposals.disable.after'] = loc_dt

return render(request, 'reviews/review_change.html',{'default_tz': default_tz})
return render(request, 'reviews/review_stages.html',{'default_tz': default_tz})


login = auth_views.LoginView.as_view(authentication_form=AuthenticationForm)
Expand Down

0 comments on commit db4fea7

Please sign in to comment.