Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
8f8b0ff2
Unverified
Commit
8f8b0ff2
authored
Nov 13, 2016
by
Joost Rijneveld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make url patterns more consistent
parent
5ecf6985
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
23 deletions
+25
-23
website/education/urls.py
website/education/urls.py
+15
-11
website/members/templates/members/account.html
website/members/templates/members/account.html
+2
-2
website/members/urls.py
website/members/urls.py
+1
-3
website/thabloid/urls.py
website/thabloid/urls.py
+1
-1
website/thaliawebsite/templates/base.html
website/thaliawebsite/templates/base.html
+1
-1
website/thaliawebsite/urls.py
website/thaliawebsite/urls.py
+5
-5
No files found.
website/education/urls.py
View file @
8f8b0ff2
from
django.conf.urls
import
url
from
django.conf.urls
import
include
,
url
from
django.views.generic.base
import
RedirectView
from
.
import
views
...
...
@@ -6,16 +6,20 @@ from . import views
app_name
=
"education"
urlpatterns
=
[
url
(
'^exam/(?P<id>[0-9]*)/$'
,
views
.
exam
,
name
=
"exam"
),
url
(
'^summary/(?P<id>[0-9]*)/$'
,
views
.
summary
,
name
=
"summary"
),
url
(
'^exam/submit/$'
,
views
.
submit_exam
,
name
=
"submit-exam"
),
url
(
'^summary/submit/$'
,
views
.
submit_summary
,
name
=
"submit-summary"
),
url
(
'^exam/submit/(?P<id>[0-9]*)/$'
,
views
.
submit_exam
,
name
=
"submit-exam"
),
url
(
'^summary/submit/(?P<id>[0-9]*)/$'
,
views
.
submit_summary
,
name
=
"submit-summary"
),
url
(
'^courses/$'
,
views
.
courses
,
name
=
"courses"
),
url
(
'^courses/(?P<id>[0-9]*)/$'
,
views
.
course
,
name
=
"course"
),
url
(
'^books/$'
,
views
.
books
,
name
=
"books"
),
url
(
'^$'
,
url
(
r'^books/$'
,
views
.
books
,
name
=
"books"
),
url
(
r'^courses/'
,
include
([
url
(
r'^$'
,
views
.
courses
,
name
=
"courses"
),
url
(
r'^(?P<id>[0-9]*)/'
,
include
([
url
(
r'^$'
,
views
.
course
,
name
=
"course"
),
url
(
r'^upload-exam/$'
,
views
.
submit_exam
,
name
=
"submit-exam"
),
url
(
r'^upload-summary/$'
,
views
.
submit_summary
,
name
=
"submit-summary"
),
])),
])),
url
(
r'^exams/(?P<id>[0-9]*)/$'
,
views
.
exam
,
name
=
"exam"
),
url
(
r'^summaries/(?P<id>[0-9]*)/$'
,
views
.
summary
,
name
=
"summary"
),
url
(
r'^upload-exam/$'
,
views
.
submit_exam
,
name
=
"submit-exam"
),
url
(
r'^upload-summary/$'
,
views
.
submit_summary
,
name
=
"submit-summary"
),
url
(
r'^$'
,
RedirectView
.
as_view
(
pattern_name
=
'education:courses'
,
permanent
=
True
),
name
=
"index"
),
]
website/members/templates/members/account.html
View file @
8f8b0ff2
...
...
@@ -16,7 +16,7 @@
<hr>
<div>
<a
href=
"{% url 'members:profile' %}"
>
{% trans "show public profile"|capfirst %}
</a>
<a
href=
"{% url 'members:profile'
request.user.pk
%}"
>
{% trans "show public profile"|capfirst %}
</a>
<p>
{% blocktrans %}Take a look at your own profile.{% endblocktrans %}
</p>
</div>
...
...
@@ -43,4 +43,4 @@
</div>
</div>
{% endblock %}}
\ No newline at end of file
{% endblock %}}
website/members/urls.py
View file @
8f8b0ff2
from
django.conf.urls
import
url
from
django.conf.urls
import
include
,
url
from
.
import
views
...
...
@@ -9,8 +9,6 @@ urlpatterns = [
views
.
get_become_a_member_document
,
name
=
'become-a-member-document'
),
url
(
'^profile/(?P<pk>[0-9]*)$'
,
views
.
profile
,
name
=
'profile'
),
url
(
'^profile$'
,
views
.
profile
,
name
=
'profile'
),
url
(
'^profile/edit/$'
,
views
.
edit_profile
,
name
=
'edit-profile'
),
url
(
'^account$'
,
views
.
account
,
name
=
'account'
),
url
(
'^$'
,
views
.
index
,
name
=
'index'
),
]
website/thabloid/urls.py
View file @
8f8b0ff2
...
...
@@ -6,5 +6,5 @@ app_name = "thabloid"
urlpatterns
=
[
url
(
r'^$'
,
views
.
index
,
name
=
'index'
),
url
(
r'^
viewer/
(?P<year>[0-9]{4})/(?P<issue>[0-9]+)/$'
,
views
.
viewer
,
name
=
'viewer'
),
url
(
r'^(?P<year>[0-9]{4})/(?P<issue>[0-9]+)/$'
,
views
.
viewer
,
name
=
'viewer'
),
]
website/thaliawebsite/templates/base.html
View file @
8f8b0ff2
...
...
@@ -68,7 +68,7 @@
</div>
{% else %}
<div
class=
"btn-group"
id=
"account-menu"
>
<a
class=
"btn btn-default"
href=
"{% url '
members:
account' %}"
><i
class=
"fa fa-user"
></i>
{% trans "My Account" %}
</a>
<a
class=
"btn btn-default"
href=
"{% url 'account' %}"
><i
class=
"fa fa-user"
></i>
{% trans "My Account" %}
</a>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
role=
"button"
aria-expanded=
"false"
>
<span
class=
"caret"
></span>
</button>
...
...
website/thaliawebsite/urls.py
View file @
8f8b0ff2
...
...
@@ -52,15 +52,15 @@ urlpatterns = [
url
(
r'^admin/'
,
admin
.
site
.
urls
),
url
(
r'^mailinglists/'
,
include
(
'mailinglists.urls'
)),
url
(
r'^members/'
,
include
(
'members.urls'
)),
url
(
r'^
nyi$'
,
TemplateView
.
as_view
(
template_name
=
'status/nyi.html'
),
name
=
'#
'
),
url
(
r'^
account/$'
,
members
.
views
.
account
,
name
=
'account
'
),
url
(
r'^events/'
,
include
(
'events.urls'
)),
url
(
r'^pizzas/'
,
include
(
'pizzas.urls'
)),
url
(
r'^index\.php/events/ical/feed\.ics'
,
DeprecationFeed
()),
url
(
r'^newsletters/'
,
include
(
'newsletters.urls'
)),
url
(
r'^association$'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/association.html'
),
name
=
'association'
),
url
(
r'^
association/'
,
include
([
url
(
r'^
activemembers/
'
,
include
(
'activemembers.urls'
)),
url
(
r'^
'
,
include
([
# 'association' menu
url
(
r'^'
,
include
(
'activemembers.urls'
)),
url
(
r'^merchandise/'
,
include
(
'merchandise.urls'
)),
url
(
r'^documents/'
,
include
(
'documents.urls'
)),
url
(
r'^become-a-member/'
,
members
.
views
.
become_a_member
,
name
=
'become-a-member'
),
...
...
@@ -69,8 +69,8 @@ urlpatterns = [
])),
url
(
r'^for-members$'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/for_members.html'
),
name
=
'for-members'
),
url
(
r'^
for-members/'
,
include
([
url
(
r'^become-active'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/become_active.html'
),
name
=
'become-active'
),
url
(
r'^
'
,
include
([
# 'for members' menu
url
(
r'^become-active
/
'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/become_active.html'
),
name
=
'become-active'
),
url
(
r'^photos/'
,
include
(
'photos.urls'
)),
url
(
r'^statistics/'
,
members
.
views
.
statistics
,
name
=
'statistics'
),
url
(
r'^styleguide/'
,
TemplateView
.
as_view
(
template_name
=
'singlepages/styleguide.html'
),
name
=
'styleguide'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment